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

tests/fprintd: Cleanup FPrintdVirtualStorageDeviceTests

Browse Source 
Avoid repeating the same things multiple times
This commit is contained in:
Marco Trevisan (Treviño)
2021-04-01 23:50:52 +02:00
parent 8869b8296f
commit aae37304e5
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/fprintd.py
View File

@ -907,11 +907,20 @@ class FPrintdVirtualStorageDeviceBaseTest(FPrintdVirtualDeviceBaseTest):
self._changed_properties.remove({'num-enroll-stages': stages}) self._changed_properties.remove({'num-enroll-stages': stages})
self.assertEqual(self.num_enroll_stages, stages) self.assertEqual(self.num_enroll_stages, stages)
def get_stored_prints(self):
return self.send_command('LIST').decode('ascii').split('\n')[:-1]
class FPrintdVirtualStorageDeviceTests(FPrintdVirtualStorageDeviceBaseTest): class FPrintdVirtualStorageDeviceTests(FPrintdVirtualStorageDeviceBaseTest):
def test_garbage_collect(self): def setUp(self):
super().setUp()
self.device.Claim('(s)', 'testuser') self.device.Claim('(s)', 'testuser')
def tearDown(self):
self.try_release()
super().tearDown()
def test_garbage_collect(self):
# We expect collection in this order # We expect collection in this order
garbage_collect = [ garbage_collect = [
'no-metadata-print', 'no-metadata-print',
@ -930,7 +939,7 @@ class FPrintdVirtualStorageDeviceTests(FPrintdVirtualStorageDeviceBaseTest):
self.enroll_print(i, f) self.enroll_print(i, f)
# The virtual device sends a trailing \n # The virtual device sends a trailing \n
prints = self.send_command('LIST').decode('ascii').split('\n')[:-1] prints = self.get_stored_prints()
self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys()))) self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys())))
def trigger_garbagecollect(): def trigger_garbagecollect():
@ -941,27 +950,23 @@ class FPrintdVirtualStorageDeviceTests(FPrintdVirtualStorageDeviceBaseTest):
trigger_garbagecollect() trigger_garbagecollect()
prints = self.send_command('LIST').decode('ascii').split('\n')[:-1] prints = self.get_stored_prints()
garbage_collect.pop() garbage_collect.pop()
self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys()))) self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys())))
trigger_garbagecollect() trigger_garbagecollect()
prints = self.send_command('LIST').decode('ascii').split('\n')[:-1] prints = self.get_stored_prints()
garbage_collect.pop() garbage_collect.pop()
self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys()))) self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys())))
trigger_garbagecollect() trigger_garbagecollect()
prints = self.send_command('LIST').decode('ascii').split('\n')[:-1] prints = self.get_stored_prints()
garbage_collect.pop() garbage_collect.pop()
self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys()))) self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys())))
self.device.Release()
def test_delete(self): def test_delete(self):
self.device.Claim('(s)', 'testuser')
# We expect collection in this order # We expect collection in this order
garbage_prints = [ garbage_prints = [
'no-metadata-print', 'no-metadata-print',
@ -982,30 +987,23 @@ class FPrintdVirtualStorageDeviceTests(FPrintdVirtualStorageDeviceBaseTest):
self.enroll_print(i, f) self.enroll_print(i, f)
# The virtual device sends a trailing \n # The virtual device sends a trailing \n
prints = self.send_command('LIST').decode('ascii').split('\n')[:-1] prints = self.get_stored_prints()
self.assertEqual(set(prints), set(garbage_prints + list(enrolled_prints.keys()))) self.assertEqual(set(prints), set(garbage_prints + list(enrolled_prints.keys())))
# Now, delete all prints for the user # Now, delete all prints for the user
self.device.DeleteEnrolledFingers2() self.device.DeleteEnrolledFingers2()
# And verify they are all gone # And verify they are all gone
prints = self.send_command('LIST').decode('ascii').split('\n')[:-1] prints = self.get_stored_prints()
self.assertEqual(set(prints), set(garbage_prints)) self.assertEqual(set(prints), set(garbage_prints))
self.device.Release()
def test_enroll_with_one_stage_only(self): def test_enroll_with_one_stage_only(self):
self.device.Claim('(s)', 'testuser')
self.addCleanup(self.device.Release)
self._maybe_reduce_enroll_stages(stages=1) self._maybe_reduce_enroll_stages(stages=1)
self.enroll_print('FP1-20000101-7-ABCDEFGH-testuser', 'left-index-finger') self.enroll_print('FP1-20000101-7-ABCDEFGH-testuser', 'left-index-finger')
self.assertEqual(self.device.ListEnrolledFingers('(s)', 'testuser'), ['left-index-finger']) self.assertEqual(self.device.ListEnrolledFingers('(s)', 'testuser'), ['left-index-finger'])
def test_scan_type_changes(self): def test_scan_type_changes(self):
self.device.Claim('(s)', 'testuser')
self.addCleanup(self.device.Release)
for scan_type in [FPrint.ScanType.PRESS, FPrint.ScanType.SWIPE]: for scan_type in [FPrint.ScanType.PRESS, FPrint.ScanType.SWIPE]:
scan_type = scan_type.value_nick scan_type = scan_type.value_nick
self.send_command('SET_SCAN_TYPE', scan_type) self.send_command('SET_SCAN_TYPE', scan_type)