Blame SOURCES/0001-Revert-test-path-increase-timeout.patch
|
 |
d0811f |
From a73d30081a13eaeffce87f997726a179ec44d817 Mon Sep 17 00:00:00 2001
|
|
|
d0811f |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
d0811f |
Date: Fri, 31 Jul 2020 10:50:37 +0200
|
|
|
d0811f |
Subject: [PATCH 1/2] Revert "test-path: increase timeout"
|
|
|
d0811f |
|
|
|
d0811f |
This partially reverts commit 500727c220354b81b68ed6667d9a6f0fafe3ba19.
|
|
|
d0811f |
|
|
|
d0811f |
I was confused by the error message: the test says it timed out, but that's
|
|
|
d0811f |
because it's waiting for a failed unit to come back to life. There is no actual
|
|
|
d0811f |
timeout.
|
|
|
d0811f |
|
|
|
d0811f |
So let's keep the minor refactoring that was done, but revert to the old short
|
|
|
d0811f |
timeout.
|
|
|
d0811f |
---
|
|
|
d0811f |
src/test/test-path.c | 2 +-
|
|
|
d0811f |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
d0811f |
|
|
|
d0811f |
diff --git a/src/test/test-path.c b/src/test/test-path.c
|
|
|
d0811f |
index 1075f31bc6..63b709c8da 100644
|
|
|
d0811f |
--- a/src/test/test-path.c
|
|
|
d0811f |
+++ b/src/test/test-path.c
|
|
|
d0811f |
@@ -82,7 +82,7 @@ static void check_states(Manager *m, Path *path, Service *service, PathState pat
|
|
|
d0811f |
assert_se(m);
|
|
|
d0811f |
assert_se(service);
|
|
|
d0811f |
|
|
|
d0811f |
- usec_t end = now(CLOCK_MONOTONIC) + 30 * USEC_PER_SEC;
|
|
|
d0811f |
+ usec_t end = now(CLOCK_MONOTONIC) + 2 * USEC_PER_SEC;
|
|
|
d0811f |
|
|
|
d0811f |
while (path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS ||
|
|
|
d0811f |
path->state != path_state || service->state != service_state) {
|