fdo-mirrors/fprintd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/fprintd.git synced 2026-01-02 15:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/fprintd: Inherit storage tests from FPrintdVirtualDeviceBaseTest

Browse source 
We can avoid lots of duplication
This commit is contained in:
Marco Trevisan (Treviño) 2021-01-23 23:54:11 +01:00
parent 72a2504fc4
commit 0b80245e8a
1 changed files with 13 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
tests/fprintd.py
View file

@ -133,6 +133,7 @@ ctx = GLib.main_context_default()
class FPrintdTest(dbusmock.DBusTestCase):
socket_env = 'FP_VIRTUAL_IMAGE'
device_driver = 'virtual_image'
@staticmethod
def path_from_service_file(sf):
@ -294,6 +295,11 @@ class FPrintdTest(dbusmock.DBusTestCase):
self._polkitd.terminate()
self._polkitd.wait()
def polkitd_allow_all(self):
self._polkitd_obj.SetAllowed([FprintDevicePermission.set_username,
FprintDevicePermission.enroll,
FprintDevicePermission.verify])
def get_current_user(self):
return pwd.getpwuid(os.getuid()).pw_name
@ -302,7 +308,6 @@ class FPrintdTest(dbusmock.DBusTestCase):
self.addCleanup(shutil.rmtree, self.test_dir)
self.state_dir = os.path.join(self.test_dir, 'state')
self.run_dir = os.path.join(self.test_dir, 'run')
self.device_driver = 'virtual_image'
self.device_id = 0
self._async_call_res = {}
os.environ['FP_DRIVERS_WHITELIST'] = self.device_driver
@ -503,16 +508,18 @@ class FPrintdTest(dbusmock.DBusTestCase):
class FPrintdVirtualDeviceBaseTest(FPrintdTest):
driver_name = 'Virtual image device'
def setUp(self):
super().setUp()
self.manager = None
self.device = None
self.polkitd_start()
self.daemon_start()
self.daemon_start(self.driver_name)
if self.device is None:
self.skipTest("Need virtual_image device to run the test")
self.skipTest("Need {} device to run the test".format(self.device_driver))
self._polkitd_obj.SetAllowed([FprintDevicePermission.set_username,
FprintDevicePermission.enroll,
@ -643,60 +650,11 @@ class FPrintdVirtualDeviceBaseTest(FPrintdTest):
return bus, dev
class FPrintdVirtualStorageDeviceBaseTest(FPrintdTest):
class FPrintdVirtualStorageDeviceBaseTest(FPrintdVirtualDeviceBaseTest):
socket_env = 'FP_VIRTUAL_DEVICE_STORAGE'
def setUp(self):
super().setUp()
os.environ['FP_DRIVERS_WHITELIST'] = 'virtual_device_storage'
self.manager = None
self.device = None
self.polkitd_start()
self.daemon_start(driver='Virtual device with storage and identification for debugging')
if self.device is None:
self.skipTest("Need virtual_storage_device device to run the test")
self._polkitd_obj.SetAllowed([FprintDevicePermission.set_username,
FprintDevicePermission.enroll,
FprintDevicePermission.verify])
def signal_cb(proxy, sender, signal, params):
print(signal, params)
if signal == 'EnrollStatus':
self._abort = params[1]
self._last_result = params[0]
if not self._abort and self._last_result.startswith('enroll-'):
# Exit wait loop, onto next enroll state (if any)
self._abort = True
elif self._abort:
pass
else:
self._abort = True
self._last_result = 'Unexpected signal values'
print('Unexpected signal values')
elif signal == 'VerifyFingerSelected':
pass
elif signal == 'VerifyStatus':
self._abort = True
self._last_result = params[0]
self._verify_stopped = params[1]
else:
self._abort = True
self._last_result = 'Unexpected signal'
self.g_signal_id = self.device.connect('g-signal', signal_cb)
def tearDown(self):
self.polkitd_stop()
self.device.disconnect(self.g_signal_id)
self.device = None
self.manager = None
super().tearDown()
device_driver = 'virtual_device_storage'
driver_name = 'Virtual device with storage and identification for debugging'
def send_command(self, command, *args):
self.assertIn(command, ['INSERT', 'REMOVE', 'SCAN', 'ERROR', 'LIST'])
@ -713,17 +671,6 @@ class FPrintdVirtualStorageDeviceBaseTest(FPrintdTest):
return b''.join(res)
def wait_for_result(self, expected=None):
self._abort = False
while not self._abort:
ctx.iteration(True)
self.assertTrue(self._abort)
self._abort = False
if expected is not None:
self.assertEqual(self._last_result, expected)
def enroll_print(self, nick, finger='right-index-finger', expected_result='enroll-completed'):
# Needs to assume success
self.send_command('SCAN', nick)