FdoSecrets: alternative way to drive unlock dialog to hopefully make …

…the test more reliable
keepassxreboot · Sep 25, 2021 · a9516f0 · a9516f0
1 parent 2f87e2e
commit a9516f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/fdosecrets/objects/Prompt.cpp b/src/fdosecrets/objects/Prompt.cpp
@@ -326,6 +326,7 @@ namespace FdoSecrets
         auto client = m_client.lock();
         if (!client) {
             // client already gone
+            qDebug() << "DBus client gone before item unlocking finish";
             return;
         }
         for (auto it = decisions.constBegin(); it != decisions.constEnd(); ++it) {

diff --git a/tests/gui/TestGuiFdoSecrets.cpp b/tests/gui/TestGuiFdoSecrets.cpp
@@ -1486,7 +1486,8 @@ void TestGuiFdoSecrets::processEvents()
 {
     // Couldn't use QApplication::processEvents, because per Qt documentation:
     //     events that are posted while the function runs will be queued until a later round of event processing.
-    // so we directly call event dispatcher in a loop until no events can be handled
+    // and we may post QTimer single shot events during event handling to achieve async method.
+    // So we directly call event dispatcher in a loop until no events can be handled
     while (QAbstractEventDispatcher::instance()->processEvents(QEventLoop::AllEvents)) {
         // pass
     }
@@ -1596,7 +1597,7 @@ bool TestGuiFdoSecrets::driveAccessControlDialog(bool remember)
             auto rememberCheck = dlg->findChild<QCheckBox*>("rememberCheck");
             VERIFY(rememberCheck);
             rememberCheck->setChecked(remember);
-            QTest::keyClick(dlg, Qt::Key_Enter);
+            dlg->done(AccessControlDialog::AllowSelected);
             processEvents();
             return true;
         }