From 8c46fddd03c48108863a0ad5504fa1cfb0dada3d Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Fri, 4 Dec 2020 18:09:48 +0100
Subject: [PATCH] verify: Fix verify script to work correctly

The verify script would start an async routine. However, this blocks the
dbus return, which really is needed.

Also, we should only return one item of the script for each VerifyStart
run. So, fix things by pop'ing the first item and putting it on the bus
from a GLib.add_timeout handler.
---
 tests/dbusmock/fprintd.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/tests/dbusmock/fprintd.py b/tests/dbusmock/fprintd.py
index d7530fe..7cce73c 100644
--- a/tests/dbusmock/fprintd.py
+++ b/tests/dbusmock/fprintd.py
@@ -18,6 +18,7 @@ __email__ = 'hadess@hadess.net'
 __copyright__ = '(c) 2020 Red Hat Inc.'
 __license__ = 'LGPL 3+'
 
+from gi.repository import GLib
 import dbus
 import asyncio
 
@@ -213,13 +214,9 @@ def can_verify_finger(device, finger_name):
         return True
     return False
 
-async def send_verify_script(device, script):
-    for [result, done, timeout] in device.verify_script:
-        await asyncio.sleep(timeout)
-        device.EmitSignal(DEVICE_IFACE, 'VerifyStatus', 'sb', [
-                            result,
-                            done
-                          ])
+def device_emit_signal(device, *args):
+    print("emitting signal", *args)
+    device.EmitSignal(*args)
 
 @dbus.service.method(DEVICE_IFACE,
                      in_signature='s', out_signature='')
@@ -249,13 +246,21 @@ def VerifyStart(device, finger_name):
     if finger_name == 'any' and not device.has_identification:
         finger_name = device.fingers[device.claimed_user][0]
     device.selected_finger = finger_name
-    device.EmitSignal(DEVICE_IFACE, 'VerifyFingerSelected', 's', [
-                          finger_name
-                      ])
+    # Needs to happen after method return
+    GLib.idle_add(device.EmitSignal,
+                  DEVICE_IFACE, 'VerifyFingerSelected', 's', [
+                    device.selected_finger
+                  ])
 
     if device.verify_script is not None and len(device.verify_script) > 0:
-        asyncio.run(send_verify_script(device, device.verify_script))
-
+        result, done, timeout = device.verify_script.pop(0)
+        GLib.timeout_add(timeout,
+                         device_emit_signal,
+                         device,
+                         DEVICE_IFACE, 'VerifyStatus', 'sb', [
+                           result,
+                           done
+                         ])
 
 @dbus.service.method(DEVICE_MOCK_IFACE,
                      in_signature='sb', out_signature='')