From 75989bd2be9a1733d1c82eeb0fd4aa6911f4ff0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sun, 20 Dec 2020 06:43:02 +0100 Subject: [PATCH] tests/fprintd: Compute timeout for daemon-stop phase depending on platform --- tests/fprintd.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/fprintd.py b/tests/fprintd.py index b7e67f9..46203fd 100644 --- a/tests/fprintd.py +++ b/tests/fprintd.py @@ -71,17 +71,20 @@ def get_timeout(topic='default'): 'valgrind': { 'test': 300, 'default': 20, - 'daemon_start': 60 + 'daemon_start': 60, + 'daemon_stop': 10, }, 'asan': { 'test': 120, 'default': 6, - 'daemon_start': 10 + 'daemon_start': 10, + 'daemon_stop': 8, }, 'default': { 'test': 60, 'default': 3, - 'daemon_start': 5 + 'daemon_start': 5, + 'daemon_stop': 2, } } @@ -278,7 +281,7 @@ class FPrintdTest(dbusmock.DBusTestCase): self.daemon.terminate() except OSError: pass - self.daemon.wait(timeout=2) + self.daemon.wait(timeout=get_timeout('daemon_start')) self.assertLess(self.daemon.returncode, 128) self.assertGreaterEqual(self.daemon.returncode, 0)