depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

virtual-device: Split verify check function in two parts to be reusable

Browse source 
We can so inject further operations in the middle, such as for the
finger status check
This commit is contained in:
Marco Trevisan (Treviño) 2021-01-25 15:06:15 +01:00
parent c3ece8621d
commit 8c45c0952e
1 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
tests/virtual-device.py
View file

@ -203,20 +203,16 @@ class VirtualDevice(unittest.TestCase):
return self._enrolled return self._enrolled
def check_verify(self, p, scan_nick, match, identify=False): def start_verify(self, p, identify=False):
self._verify_match = None self._verify_match = None
self._verify_fp = None self._verify_fp = None
self._verify_error = None self._verify_error = None
self._verify_completed = False self._verify_completed = False
self._cancellable = Gio.Cancellable()
if identify: if identify:
self.assertTrue(self.dev.supports_identify()) self.assertTrue(self.dev.supports_identify())
if isinstance(scan_nick, str):
self.send_command('SCAN', scan_nick)
else:
self.send_auto(scan_nick)
def verify_cb(dev, res): def verify_cb(dev, res):
try: try:
self._verify_match, self._verify_fp = ( self._verify_match, self._verify_fp = (
@ -227,13 +223,36 @@ class VirtualDevice(unittest.TestCase):
self._verify_completed = True self._verify_completed = True
if identify: if identify:
self.dev.identify(p if isinstance(p, list) else [p], callback=verify_cb) self.dev.identify(p if isinstance(p, list) else [p],
cancellable=self._cancellable, callback=verify_cb)
else: else:
self.dev.verify(p, callback=verify_cb) self.dev.verify(p, cancellable=self._cancellable, callback=verify_cb)
def cancel_verify(self):
self._cancellable.cancel()
while not self._verify_completed: while not self._verify_completed:
ctx.iteration(True) ctx.iteration(True)
self.assertIsNone(self._verify_match)
self.assertIsNotNone(self._verify_error)
self.assertEqual(self.dev.get_finger_status(), FPrint.FingerStatusFlags.NONE)
def complete_verify(self):
while not self._verify_completed:
ctx.iteration(True)
if self._verify_error is not None:
raise self._verify_error
def check_verify(self, p, scan_nick, match, identify=False):
if isinstance(scan_nick, str):
self.send_command('SCAN', scan_nick)
else:
self.send_auto(scan_nick)
self.start_verify(p, identify)
self.complete_verify()
if identify: if identify:
if match: if match:
self.assertIsNotNone(self._verify_match) self.assertIsNotNone(self._verify_match)
@ -248,9 +267,6 @@ class VirtualDevice(unittest.TestCase):
if isinstance(scan_nick, str): if isinstance(scan_nick, str):
self.assertEqual(self._verify_fp.props.fpi_data.get_string(), scan_nick) self.assertEqual(self._verify_fp.props.fpi_data.get_string(), scan_nick)
if self._verify_error is not None:
raise self._verify_error
def test_device_properties(self): def test_device_properties(self):
self.assertEqual(self.dev.get_driver(), 'virtual_device') self.assertEqual(self.dev.get_driver(), 'virtual_device')
self.assertEqual(self.dev.get_device_id(), '0') self.assertEqual(self.dev.get_device_id(), '0')
@ -294,16 +310,8 @@ class VirtualDevice(unittest.TestCase):
FPrint.DeviceRetry.TOO_SHORT, match=False) FPrint.DeviceRetry.TOO_SHORT, match=False)
def test_finger_status(self): def test_finger_status(self):
cancellable = Gio.Cancellable() self.start_verify(FPrint.Print.new(self.dev),
got_cb = False identify=self.dev.supports_identify())
def verify_cb(dev, res):
nonlocal got_cb
got_cb = True
self.dev.verify(FPrint.Print.new(self.dev), callback=verify_cb, cancellable=cancellable)
while not self.dev.get_finger_status() is FPrint.FingerStatusFlags.NEEDED:
ctx.iteration(True)
self.send_finger_report(True) self.send_finger_report(True)
self.assertEqual(self.dev.get_finger_status(), self.assertEqual(self.dev.get_finger_status(),
@ -312,11 +320,7 @@ class VirtualDevice(unittest.TestCase):
self.send_finger_report(False) self.send_finger_report(False)
self.assertEqual(self.dev.get_finger_status(), FPrint.FingerStatusFlags.NEEDED) self.assertEqual(self.dev.get_finger_status(), FPrint.FingerStatusFlags.NEEDED)
cancellable.cancel() self.cancel_verify()
while not got_cb:
ctx.iteration(True)
self.assertEqual(self.dev.get_finger_status(), FPrint.FingerStatusFlags.NONE)
def test_change_enroll_stages(self): def test_change_enroll_stages(self):
notified_spec = None notified_spec = None