fdo-mirrors/fprintd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/fprintd.git synced 2026-05-21 10:48:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'increase-log-output-timeout' into 'master'

Browse source 
tests/fprintd: Increase timeout on waiting closed logs

See merge request libfprint/fprintd!227
This commit is contained in:
Marco Trevisan 2026-05-16 04:27:54 +00:00
commit 12889f58d2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/fprintd.py
View file

@ -235,12 +235,13 @@ class FPrintdTest(dbusmock.DBusTestCase):
argv = [self.paths['daemon'], '-t']
valgrind = os.getenv('VALGRIND')
if valgrind is not None:
self.valgrind = valgrind is not None
if self.valgrind:
argv.insert(0, 'valgrind')
argv.insert(1, '--leak-check=full')
if os.path.exists(valgrind):
argv.insert(2, '--suppressions=%s' % valgrind)
self.valgrind = True
self.kill_daemon = False
self.daemon_log = OutputChecker()
self.addCleanup(self.daemon_log.force_close)
@ -311,7 +312,7 @@ class FPrintdTest(dbusmock.DBusTestCase):
else:
raise(e)
self.daemon_log.assert_closed()
self.daemon_log.assert_closed(timeout=5 if self.valgrind else 3)
if not self.kill_daemon:
self.assertLess(self.daemon.returncode, 128)
@ -3172,12 +3173,13 @@ class FPrintdUtilsTest(FPrintdVirtualStorageDeviceBaseTest):
argv = [self.utils[name]] + args
valgrind = os.getenv('VALGRIND')
if valgrind is not None:
self.valgrind = valgrind is not None
if self.valgrind:
argv.insert(0, 'valgrind')
argv.insert(1, '--leak-check=full')
if os.path.exists(valgrind):
argv.insert(2, '--suppressions=%s' % valgrind)
self.valgrind = True
output = OutputChecker()
self.utils_proc[name] = subprocess.Popen(argv,
env=env,