From 4e075ba491d7d68d5d882f2daf5936277fc8aeb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 1 Apr 2021 19:15:34 +0200
Subject: [PATCH] tests/fprintd: Repeat enroll tests with virtual device with
 no storage

No storage-device does not support identification so we need to try this
case as well
---
 tests/fprintd.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/fprintd.py b/tests/fprintd.py
index 940e5e9..a90bd5c 100644
--- a/tests/fprintd.py
+++ b/tests/fprintd.py
@@ -659,7 +659,8 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
             self.assertEqual(self._last_result, expected)
 
     def enroll_image(self, img, device=None, finger='right-index-finger',
-                     expected_result='enroll-completed', claim_user=None):
+                     expected_result='enroll-completed', claim_user=None,
+                     start=True, stop=True):
         if device is None:
             device = self.device
         if claim_user:
@@ -668,7 +669,8 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
         if device is self.device:
             self._maybe_reduce_enroll_stages()
 
-        device.EnrollStart('(s)', finger)
+        if start:
+            device.EnrollStart('(s)', finger)
 
         while not self.finger_needed:
             ctx.iteration(False)
@@ -683,7 +685,9 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
                 self.wait_for_result(expected_result)
                 self.assertFalse(self.finger_needed)
 
-        device.EnrollStop()
+        if stop:
+            device.EnrollStop()
+
         self.assertEqual(self._last_result, expected_result)
         self.assertFalse(self.finger_needed)
 
@@ -2226,9 +2230,7 @@ class FPrintdVirtualDeviceEnrollTests(FPrintdVirtualDeviceBaseTest):
             self.device.EnrollStart('(s)', 'left-thumb')
 
     def test_verify_start_during_enroll(self):
-        self.device.EnrollStop()
-        self.wait_for_result()
-        self.enroll_image('whorl')
+        self.enroll_image('whorl', start=False)
         self.device.EnrollStart('(s)', 'right-thumb')
         with self.assertFprintError('AlreadyInUse'):
             self.device.VerifyStart('(s)', 'any')
@@ -2264,6 +2266,12 @@ class FPrintdVirtualDeviceEnrollTests(FPrintdVirtualDeviceBaseTest):
         self.assertIn(GLib.Variant('()', ()), self.get_all_async_replies())
 
 
+class FPrintdVirtualDeviceNoStorageEnrollTests(FPrintdVirtualNoStorageDeviceBaseTest,
+                                               FPrintdVirtualDeviceEnrollTests):
+    # Repeat the tests for the Virtual device (with no storage)
+    pass
+
+
 class FPrintdVirtualDeviceStorageClaimedTest(FPrintdVirtualStorageDeviceBaseTest,
                                              FPrintdVirtualDeviceClaimedTest):
     # Repeat the tests for the Virtual storage device