colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clients/tests: fix handling timeout for asynchronous jobs

Browse Source 
Fixes: bb4b749595 ('clients/tests: don't wait for first job before scheduling parallel jobs')
This commit is contained in:
Thomas Haller
2019-10-12 22:17:09 +02:00
parent bb4b749595
commit b6725a59d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clients/tests/test-client.py
View File

@@ -444,7 +444,7 @@ class AsyncProcess():
args, args,
env, env,
complete_cb, complete_cb,
max_waittime_msec = 2000): max_waittime_msec = 3000):
self._args = list(args) self._args = list(args)
self._env = env self._env = env
self._complete_cb = complete_cb self._complete_cb = complete_cb
@@ -471,7 +471,7 @@ class AsyncProcess():
self.start() self.start()
return_code = Util.popen_wait(self._p, timeout) 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: and self._timeout_remaining_time() <= 0:
raise Exception("process is still running after timeout: %s" % (' '.join(self._args))) raise Exception("process is still running after timeout: %s" % (' '.join(self._args)))
return return_code return return_code