From c8c543672d5220a1a815476b17366d2c80518014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 23 Jan 2021 16:00:25 +0100 Subject: [PATCH] tests/fprintd: Make assertFprintError to accept list of errors we accept It can be used to check if any of the error that is passed is raised --- tests/fprintd.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/fprintd.py b/tests/fprintd.py index 8718ff8..9ecbca7 100755 --- a/tests/fprintd.py +++ b/tests/fprintd.py @@ -308,9 +308,15 @@ class FPrintdTest(dbusmock.DBusTestCase): os.environ['FP_DRIVERS_WHITELIST'] = self.device_driver def assertFprintError(self, fprint_error): + if isinstance(fprint_error, list) or isinstance(fprint_error, tuple): + fprint_error = [ re.escape(e) for e in fprint_error ] + fprint_error = '({})'.format('|'.join(fprint_error)) + else: + fprint_error = re.escape(fprint_error) + return self.assertRaisesRegex(GLib.Error, - re.escape('GDBus.Error:{}.Error.{}:'.format( - FPRINT_NAMESPACE, fprint_error))) + re.escape('GDBus.Error:{}.Error.'.format(FPRINT_NAMESPACE)) + + '{}:'.format(fprint_error)) def skipTestIfCanWrite(self, path): try: