From 714f499ab66abcaf182b7f685e6eae8ad4faded2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Feb 2020 18:31:40 +0100 Subject: [PATCH] tests: Double the timeouts when testing with address sanitizer --- tests/fprintd.py | 14 ++++++++++++-- tests/test_fprintd_utils.py | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/fprintd.py b/tests/fprintd.py index 9cef334..9406fd9 100755 --- a/tests/fprintd.py +++ b/tests/fprintd.py @@ -51,6 +51,11 @@ def get_timeout(topic='default'): 'default': 20, 'daemon_start': 60 }, + 'asan': { + 'test': 120, + 'default': 6, + 'daemon_start': 10 + }, 'default': { 'test': 60, 'default': 3, @@ -58,8 +63,13 @@ def get_timeout(topic='default'): } } - valgrind = os.getenv('VALGRIND') - lut = vals['valgrind' if valgrind is not None else 'default'] + if os.getenv('VALGRIND') is not None: + lut = vals['valgrind'] + elif os.getenv('ADDRESS_SANITIZER') is not None: + lut = vals['asan'] + else: + lut = vals['default'] + if topic not in lut: raise ValueError('invalid topic') return lut[topic] diff --git a/tests/test_fprintd_utils.py b/tests/test_fprintd_utils.py index 846d18f..e1ff4f9 100755 --- a/tests/test_fprintd_utils.py +++ b/tests/test_fprintd_utils.py @@ -57,6 +57,9 @@ class TestFprintd(dbusmock.DBusTestCase): if os.path.exists(valgrind): klass.wrapper_args += ['--suppressions={}'.format(valgrind)] + if 'ADDRESS_SANITIZER' in os.environ: + klass.sleep_time *= 2 + def setUp(self): (self.p_mock, self.obj_fprintd_manager) = self.spawn_server_template( self.template_name, {}, stdout=subprocess.PIPE)