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