keyring: simplify and make more robust

This avoids some magic waits by asserting screens (which is much
more reliable), and combines KDE and GNOME flows in the
passwordless test by adding some needle tags to the nautilus
needles.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

needles/gnome/apps/keyring/keyring_askpass_password-gnome.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 226,
-      "ypos": 271,
-      "width": 164,
-      "height": 19,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "keyring_askpass_password"
-  ]
-}

needles/gnome/apps/keyring/keyring_askpass_yesno-ptyxis-20241005.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 21,
+      "width": 170,
+      "ypos": 240,
+      "xpos": 550,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_askpass_yesno"
+  ]
+}

needles/gnome/apps/nautilus/nautilus_autounlock_password.json

@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_autounlock_password"
+    "nautilus_autounlock_password",
+    "keyring_askpass_remember",
+    "DESKTOP-gnome"
   ]
-}
+}

needles/gnome/apps/nautilus/nautilus_remember_password.json

@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_remember_password"
+    "nautilus_remember_password",
+    "keyring_askpass_remember",
+    "DESKTOP-gnome"
   ]
-}
+}

needles/gnome/apps/nautilus/nautilus_unlock-20240514.json

@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_unlock"
+    "nautilus_unlock",
+    "keyring_askpass_confirm",
+    "DESKTOP-gnome"
   ]
-}
+}

needles/gnome/apps/nautilus/nautilus_unlock.json

@@ -10,6 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_unlock"
+    "nautilus_unlock",
+    "keyring_askpass_confirm",
+    "DESKTOP-gnome"
   ]
-}
+}

needles/kde/apps/keyring/keyring_askpass_confirm.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_confirm"
+    "keyring_askpass_confirm",
+    "DESKTOP-kde"
   ]
-}
+}

needles/kde/apps/keyring/keyring_askpass_password.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 379,
-      "ypos": 322,
-      "width": 167,
-      "height": 19,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "keyring_askpass_password"
-  ]
-}

needles/kde/apps/keyring/keyring_askpass_remember.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_remember"
+    "keyring_askpass_remember",
+    "DESKTOP-kde"
   ]
-}
+}

needles/kde/apps/keyring/keyring_askpass_yesno-20240510.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_yesno"
+    "keyring_askpass_yesno",
+    "DESKTOP-kde"
   ]
-}
+}

needles/kde/apps/keyring/keyring_askpass_yesno.json

@@ -11,6 +11,7 @@
   ],
   "properties": [],
   "tags": [
-    "keyring_askpass_yesno"
+    "keyring_askpass_yesno",
+    "DESKTOP-kde"
   ]
-}
+}

tests/applications/keyring/keyring_password.pm

@@ -46,10 +46,10 @@ sub connect_localhost {
         # in the password. We will also try to remember the
         # password and confirm the connection.
         if ($type ne "reconnect") {
-            wait_still_screen(3);
+            assert_screen("keyring_askpass_remember");
             type_very_safely($pass);
-            assert_and_click("nautilus_remember_password");
-            assert_and_click("nautilus_unlock");
+            click_lastmatch;
+            assert_and_click("keyring_askpass_confirm");
         }
         # When the connection has been established,
         # a new connection icon will appear.
@@ -83,9 +83,9 @@ sub connect_localhost {
             # Then similarly to Gnome, the password dialogue will appear
             # and we type in the password. Also, we click on Remember
             # and confirm with the OK button.
-            assert_screen("keyring_askpass_password");
+            assert_screen("keyring_askpass_remember");
             type_very_safely("$pass");
-            assert_and_click("keyring_askpass_remember");
+            click_lastmatch;
             assert_and_click("keyring_askpass_confirm");
         }
         # Check that we have logged in and exit the application.

tests/applications/keyring/keyring_passwordless.pm

@@ -46,25 +46,16 @@ sub connect_localhost {
     # the SSH key.
     my $command = "sftp $user" . '@localhost';
     enter_cmd($command);
-    sleep 2;
 
     # When connecting for the first time, we will remember
     # the key password and store it in the keyring.
     if ($type ne "reconnect") {
-        if ($desktop eq "gnome") {
-            type_very_safely("yes\n");
-            wait_still_screen(2);
-            type_very_safely("sshpassword");
-            assert_and_click("nautilus_autounlock_password");
-            assert_and_click("nautilus_unlock");
-        }
-        else {
-            type_very_safely("yes\n");
-            wait_still_screen(2);
-            type_very_safely("sshpassword");
-            assert_and_click("keyring_askpass_remember");
-            assert_and_click("keyring_askpass_confirm");
-        }
+        assert_screen("keyring_askpass_yesno");
+        type_very_safely("yes\n");
+        assert_screen("keyring_askpass_remember");
+        type_very_safely("sshpassword");
+        click_lastmatch;
+        assert_and_click("keyring_askpass_confirm");
     }
 
     # The connection should have been established if everything has worked