cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-08 20:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests/fprintd: Add ability to force-kill the daemon if we're fine to hang

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2021-01-27 15:55:48 +01:00
parent 75989bd2be
commit 1deb1e2044
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/fprintd.py
View File

@ -227,6 +227,7 @@ class FPrintdTest(dbusmock.DBusTestCase):
if os.path.exists(valgrind): if os.path.exists(valgrind):
argv.insert(2, '--suppressions=%s' % valgrind) argv.insert(2, '--suppressions=%s' % valgrind)
self.valgrind = True self.valgrind = True
self.kill_daemon = False
self.daemon = subprocess.Popen(argv, self.daemon = subprocess.Popen(argv,
env=env, env=env,
stdout=None, stdout=None,
@ -281,9 +282,18 @@ class FPrintdTest(dbusmock.DBusTestCase):
self.daemon.terminate() self.daemon.terminate()
except OSError: except OSError:
pass pass
self.daemon.wait(timeout=get_timeout('daemon_start'))
self.assertLess(self.daemon.returncode, 128) try:
self.assertGreaterEqual(self.daemon.returncode, 0) self.daemon.wait(timeout=get_timeout('daemon_stop'))
except subprocess.TimeoutExpired as e:
if self.kill_daemon:
self.daemon.kill()
else:
raise(e)
if not self.kill_daemon:
self.assertLess(self.daemon.returncode, 128)
self.assertGreaterEqual(self.daemon.returncode, 0)
self.daemon = None self.daemon = None