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

tests/fprintd: Move assertFprintError to FPrintdTest

Browse Source 
This may be used by any class inheriting FPrintdTest, so let's move it at
lower level.
This commit is contained in:
Marco Trevisan (Treviño)
2020-02-08 10:20:18 +01:00
committed by Bastien Nocera
parent 3821b96ca5
commit 657b90a066
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/fprintd.py
View File

@ -264,6 +264,10 @@ class FPrintdTest(dbusmock.DBusTestCase):
self.run_dir = os.path.join(self.test_dir, 'run') self.run_dir = os.path.join(self.test_dir, 'run')
os.environ['FP_DRIVERS_WHITELIST'] = 'virtual_image' 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 # From libfprint tests
def send_retry(self, retry_error=FPrint.DeviceRetry.TOO_SHORT): def send_retry(self, retry_error=FPrint.DeviceRetry.TOO_SHORT):
with Connection(self.sockaddr) as con: with Connection(self.sockaddr) as con:
@ -338,10 +342,6 @@ class FPrintdVirtualDeviceBaseTest(FPrintdTest):
super().tearDown() 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): def wait_for_result(self, expected=None):
self._abort = False self._abort = False
while not self._abort: while not self._abort: