From f2514f43f6b08e48c6c726d9cd980c222bee75d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 26 Jan 2021 20:42:08 +0100 Subject: [PATCH] tests/fprintd: Return more data about the enrolled prints It may be useful to be able to associate them to their user --- tests/fprintd.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/fprintd.py b/tests/fprintd.py index 94f16d9..bba8a39 100644 --- a/tests/fprintd.py +++ b/tests/fprintd.py @@ -665,6 +665,7 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests): } enroll_map.update(images_override) enrolled_prints = [] + enrolled_prints_info = {} self.try_release() @@ -673,15 +674,21 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests): for finger, p in print_map.items(): self.enroll_image(p, finger=finger) enrolled_prints.append(p) + enrolled_prints_info[p] = (user, finger) self.device.Release() self.assertCountEqual(enrolled_prints, set(enrolled_prints)) for user in enroll_map: - enrolled = self.device.ListEnrolledFingers('(s)', user) - self.assertCountEqual(enroll_map[user].keys(), enrolled) + enrolled_fingers = enroll_map[user].keys() + if enrolled_fingers: + enrolled = self.device.ListEnrolledFingers('(s)', user) + 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): addr = os.environ['DBUS_SYSTEM_BUS_ADDRESS'] @@ -1657,7 +1664,7 @@ class FPrintdVirtualDeviceClaimedTest(FPrintdVirtualDeviceBaseTest): self.device.VerifyStop() 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) for verifying_user in enrolled_users: