tests/fprintd: Return more data about the enrolled prints

It may be useful to be able to associate them to their user
This commit is contained in:
Marco Trevisan (Treviño)
2021-01-26 20:42:08 +01:00
parent 8ef255a3bd
commit f2514f43f6

View File

@ -665,6 +665,7 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
} }
enroll_map.update(images_override) enroll_map.update(images_override)
enrolled_prints = [] enrolled_prints = []
enrolled_prints_info = {}
self.try_release() self.try_release()
@ -673,15 +674,21 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
for finger, p in print_map.items(): for finger, p in print_map.items():
self.enroll_image(p, finger=finger) self.enroll_image(p, finger=finger)
enrolled_prints.append(p) enrolled_prints.append(p)
enrolled_prints_info[p] = (user, finger)
self.device.Release() self.device.Release()
self.assertCountEqual(enrolled_prints, set(enrolled_prints)) self.assertCountEqual(enrolled_prints, set(enrolled_prints))
for user in enroll_map: for user in enroll_map:
enrolled_fingers = enroll_map[user].keys()
if enrolled_fingers:
enrolled = self.device.ListEnrolledFingers('(s)', user) enrolled = self.device.ListEnrolledFingers('(s)', user)
self.assertCountEqual(enroll_map[user].keys(), enrolled) self.assertCountEqual(enrolled_fingers, enrolled)
else:
with self.assertFprintError('NoEnrolledPrints'):
self.device.ListEnrolledFingers('(s)', user)
return enroll_map return (enroll_map, enrolled_prints_info)
def get_secondary_bus_and_device(self, claim=None): def get_secondary_bus_and_device(self, claim=None):
addr = os.environ['DBUS_SYSTEM_BUS_ADDRESS'] addr = os.environ['DBUS_SYSTEM_BUS_ADDRESS']
@ -1657,7 +1664,7 @@ class FPrintdVirtualDeviceClaimedTest(FPrintdVirtualDeviceBaseTest):
self.device.VerifyStop() self.device.VerifyStop()
def test_verify_any_finger_multiple_users(self): def test_verify_any_finger_multiple_users(self):
enroll_map = self.enroll_users_images() enroll_map, enrolled_prints_info = self.enroll_users_images()
enrolled_users = list(enroll_map) enrolled_users = list(enroll_map)
for verifying_user in enrolled_users: for verifying_user in enrolled_users: