From b6725a59d098f3630bef31a89891fbd18111ffd6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 12 Oct 2019 22:17:09 +0200 Subject: [PATCH] clients/tests: fix handling timeout for asynchronous jobs Fixes: bb4b749595bc ('clients/tests: don't wait for first job before scheduling parallel jobs') --- clients/tests/test-client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 03e19ac5f..816ed069f 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -444,7 +444,7 @@ class AsyncProcess(): args, env, complete_cb, - max_waittime_msec = 2000): + max_waittime_msec = 3000): self._args = list(args) self._env = env self._complete_cb = complete_cb @@ -471,7 +471,7 @@ class AsyncProcess(): self.start() return_code = Util.popen_wait(self._p, timeout) - if return_code is not None \ + if return_code is None \ and self._timeout_remaining_time() <= 0: raise Exception("process is still running after timeout: %s" % (' '.join(self._args))) return return_code