mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-09 04:13:33 +02:00
tests/fprintd: Unset the values we monitor for results on wait_for_result
We need to ensure those assume the value we want after waiting
This commit is contained in:
@ -579,6 +579,8 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
|
|||||||
super().tearDown()
|
super().tearDown()
|
||||||
|
|
||||||
def wait_for_result(self, expected=None, max_wait=-1):
|
def wait_for_result(self, expected=None, max_wait=-1):
|
||||||
|
self._last_result = None
|
||||||
|
self._verify_stopped = False
|
||||||
self._abort = False
|
self._abort = False
|
||||||
|
|
||||||
if max_wait > 0:
|
if max_wait > 0:
|
||||||
@ -2200,9 +2202,12 @@ class FPrintdVirtualDeviceVerificationTests(FPrintdVirtualDeviceBaseTest):
|
|||||||
|
|
||||||
self.assertTrue(self._verify_stopped)
|
self.assertTrue(self._verify_stopped)
|
||||||
self.assertEqual(self._last_result, 'verify-match')
|
self.assertEqual(self._last_result, 'verify-match')
|
||||||
|
self.assertTrue(self.finger_present)
|
||||||
|
|
||||||
self.send_error(con=con)
|
self.send_error(con=con)
|
||||||
self.wait_for_result(max_wait=200, expected='verify-match')
|
self.wait_for_result(max_wait=200)
|
||||||
|
self.assertIsNone(self._last_result)
|
||||||
|
self.assertFalse(self.finger_present)
|
||||||
|
|
||||||
def test_verify_stop_restarts_immediately(self):
|
def test_verify_stop_restarts_immediately(self):
|
||||||
self.send_image('tented_arch')
|
self.send_image('tented_arch')
|
||||||
@ -2272,7 +2277,9 @@ class FPrintdVirtualDeviceStorageVerificationUtils(object):
|
|||||||
self.assertTrue(self._verify_stopped)
|
self.assertTrue(self._verify_stopped)
|
||||||
self.assertEqual(self._last_result, 'verify-match')
|
self.assertEqual(self._last_result, 'verify-match')
|
||||||
|
|
||||||
self.wait_for_result(max_wait=200, expected='verify-match')
|
self.wait_for_result(max_wait=200)
|
||||||
|
self.assertIsNone(self._last_result)
|
||||||
|
self.assertFalse(self.finger_present)
|
||||||
|
|
||||||
class FPrintdVirtualDeviceStorageVerificationTests(FPrintdVirtualStorageDeviceBaseTest,
|
class FPrintdVirtualDeviceStorageVerificationTests(FPrintdVirtualStorageDeviceBaseTest,
|
||||||
FPrintdVirtualDeviceStorageVerificationUtils,
|
FPrintdVirtualDeviceStorageVerificationUtils,
|
||||||
|
|||||||
Reference in New Issue
Block a user