From 657b90a0660257df6dd8926e650c89e02db49c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 8 Feb 2020 10:20:18 +0100 Subject: [PATCH] tests/fprintd: Move assertFprintError to FPrintdTest This may be used by any class inheriting FPrintdTest, so let's move it at lower level. --- tests/fprintd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/fprintd.py b/tests/fprintd.py index 91950c0..8d79599 100755 --- a/tests/fprintd.py +++ b/tests/fprintd.py @@ -264,6 +264,10 @@ class FPrintdTest(dbusmock.DBusTestCase): self.run_dir = os.path.join(self.test_dir, 'run') os.environ['FP_DRIVERS_WHITELIST'] = 'virtual_image' + def assertFprintError(self, fprint_error): + return self.assertRaisesRegex(GLib.Error, + '.*net\.reactivated\.Fprint\.Error\.{}.*'.format(fprint_error)) + # From libfprint tests def send_retry(self, retry_error=FPrint.DeviceRetry.TOO_SHORT): with Connection(self.sockaddr) as con: @@ -338,10 +342,6 @@ class FPrintdVirtualDeviceBaseTest(FPrintdTest): super().tearDown() - def assertFprintError(self, fprint_error): - return self.assertRaisesRegex(GLib.Error, - '.*net\.reactivated\.Fprint\.Error\.{}.*'.format(fprint_error)) - def wait_for_result(self, expected=None): self._abort = False while not self._abort: