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>

lib/utils.pm

@@ -475,8 +475,8 @@ sub get_workarounds {
     my %workarounds = (
         "39" => [],
         "40" => [],
-        "41" => [],
-        "42" => [],
+        "41" => ["FEDORA-2024-e331cd53ac", "FEDORA-2024-cb1e9f47a3"],
+        "42" => ["124312792"],
         "eln" => [],
     );
     my $advortasks = $workarounds{$version};

main.pm

@@ -352,11 +352,8 @@ sub load_postinstall_tests() {
     }
 
     # load the ADVISORY / KOJITASK post-install test - this records which
-    # update or task packages were actually installed during the test. Don't
-    # do this for netinst tests; as these just use the default install repo,
-    # they will not get the packages from the update. But installs from live
-    # image and ostree installer image should get them.
-    if (get_var("ADVISORY_OR_TASK") && get_var("TEST") ne "install_default_update_netinst") {
+    # update or task packages were actually installed during the test.
+    if (get_var("ADVISORY_OR_TASK") && !get_var("NO_ADVISORY_POST")) {
         # don't do this for support server unless the update is for the same
         # release as the support server disk image, as we don't install the
         # updates on support server when they differ

needles/console/console_in_toolbox-20241005.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 1,
+      "width": 20,
+      "ypos": 753,
+      "type": "match",
+      "height": 14
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "console_in_toolbox"
+  ]
+}

needles/console/root_logged_in-dracut-20241005.json

@@ -0,0 +1,25 @@
+{
+  "area": [
+    {
+      "xpos": 71,
+      "width": 72,
+      "ypos": 625,
+      "type": "match",
+      "height": 14
+    },
+    {
+      "xpos": 48,
+      "ypos": 753,
+      "width": 30,
+      "height": 15,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "root_logged_in",
+    "root_console",
+    "root_console_dracut",
+    "ENV-DISTRI-fedora"
+  ]
+}

needles/gnome/apps/gnome-panel/panel_screen_locked-20241004.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 59,
+      "width": 52,
+      "xpos": 484,
+      "ypos": 309
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "panel_screen_locked"
+  ]
+}

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_seahorse_login_details-20241004.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 105,
+      "width": 193,
+      "xpos": 338,
+      "height": 38,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "keyring_seahorse_login_details"
+  ]
+}

needles/gnome/apps/loupe/loupe_img_info-20241005.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 57,
+      "xpos": 793,
+      "ypos": 512,
+      "type": "match",
+      "height": 204
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "loupe_img_info"
+  ]
+}

needles/gnome/apps/loupe/loupe_shortcuts_alt_page-20241005.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 18,
+      "width": 18,
+      "xpos": 502,
+      "ypos": 750
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "loupe_shortcuts_alt_page"
+  ]
+}

needles/gnome/apps/loupe/loupe_shortcuts_alt_shown-20241005.json

@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 22,
+      "width": 116,
+      "xpos": 181,
+      "ypos": 550
+    },
+    {
+      "height": 20,
+      "type": "match",
+      "ypos": 66,
+      "width": 95,
+      "xpos": 441
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "loupe_shortcuts_alt_shown"
+  ]
+}

needles/gnome/apps/loupe/loupe_shortcuts_shown-20241004.json

@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 19,
+      "width": 121,
+      "xpos": 388,
+      "ypos": 66
+    },
+    {
+      "xpos": 182,
+      "width": 65,
+      "ypos": 66,
+      "type": "match",
+      "height": 17
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "loupe_shortcuts_shown"
+  ]
+}

needles/gnome/apps/loupe/loupe_side_panel-20241004.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 793,
+      "width": 79,
+      "ypos": 190,
+      "type": "match",
+      "height": 143
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "loupe_side_panel"
+  ]
+}

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/akonadi_migration_notification-20241005.json

@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 18,
+      "xpos": 587,
+      "width": 130,
+      "ypos": 373
+    },
+    {
+      "type": "match",
+      "height": 19,
+      "xpos": 984,
+      "width": 17,
+      "ypos": 345
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "akonadi_migration_notification"
+  ]
+}

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"
   ]
 }

needles/kde/desktop_package_tool_action_select-kde-20241005.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 15,
+      "xpos": 501,
+      "width": 99,
+      "ypos": 690
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "desktop_package_tool_action_select"
+  ]
+}

needles/kde/desktop_package_tool_restart_automatically-kde-20241005.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 499,
+      "width": 49,
+      "ypos": 629,
+      "type": "match",
+      "height": 16
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "desktop_package_tool_restart_automatically"
+  ]
+}

needles/kde/printing_check_sentence-20241005.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 136,
+      "xpos": 219,
+      "width": 305,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "printing_check_sentence"
+  ]
+}

templates-updates.fif.json

@@ -351,12 +351,24 @@
                 "fedora-updates-workstation-x86_64-*-64bit": 5
             }
         },
+        "desktop_keyring": {
+            "profiles": {
+                "fedora-updates-kde-x86_64-*-64bit": 5,
+                "fedora-updates-workstation-x86_64-*-64bit": 5
+            }
+        },
         "desktop_printing": {
             "profiles": {
                 "fedora-updates-kde-x86_64-*-64bit": 5,
                 "fedora-updates-workstation-x86_64-*-64bit": 5
             }
         },
+        "desktop_printing_builtin": {
+            "profiles": {
+                "fedora-updates-kde-x86_64-*-64bit": 5,
+                "fedora-updates-workstation-x86_64-*-64bit": 5
+            }
+        },
         "desktop_terminal": {
             "profiles": {
                 "fedora-updates-kde-x86_64-*-64bit": 5,
@@ -395,6 +407,7 @@
                 "INSTALL_UNLOCK": "support_ready",
                 "ISO": "%ADVISORY_OR_TASK%-netinst-%ARCH%.iso",
                 "NICTYPE": "tap",
+                "NO_ADVISORY_POST": "1",
                 "PACKAGE_SET": "default",
                 "PARALLEL_WITH": "support_server@%ARCH_BASE_MACHINE%",
                 "WORKER_CLASS": "tap"
@@ -601,6 +614,11 @@
                 "fedora-updates-everything-boot-iso-x86_64-*-64bit": 5
             }
         },
+        "toolbox": {
+            "profiles": {
+                "fedora-updates-workstation-x86_64-*-64bit": 5
+            }
+        },
         "upgrade_desktop_encrypted_64bit": {
             "profiles": {
                 "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5

templates.fif.json

@@ -964,6 +964,8 @@
             "settings": {
                 "BOOTFROM": "c",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "NO_ADVISORY_POST": "1",
+                "NO_UEFI_POST": "1",
                 "POSTINSTALL": "desktop_login",
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
@@ -1429,14 +1431,14 @@
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
-        "i3_tilling": {
+        "i3_tiling": {
             "profiles": {
                 "fedora-i3-live-x86_64-*-64bit": 70
             },
             "settings": {
                 "BOOTFROM": "c",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
-                "POSTINSTALL": "i3_tilling",
+                "POSTINSTALL": "i3_tiling",
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },

tests/applications/clocks/alarm.pm

@@ -13,7 +13,9 @@ sub run {
 
     # Add a new alarm using the Add Alarm button
     assert_and_click("clocks_button_add_alarm");
-    assert_and_dclick("clocks_alarm_hour");
+    assert_and_click("clocks_alarm_hour");
+    wait_still_screen 2;
+    send_key("ctrl-a");
     wait_still_screen(2);
     type_very_safely("09");
     send_key("tab");

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,26 +46,17 @@ 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") {
+        assert_screen("keyring_askpass_yesno");
         type_very_safely("yes\n");
-            wait_still_screen(2);
+        assert_screen("keyring_askpass_remember");
         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");
+        click_lastmatch;
         assert_and_click("keyring_askpass_confirm");
     }
-    }
 
     # The connection should have been established if everything has worked
     # so far.

tests/graphical_upgrade_run.pm

@@ -80,6 +80,8 @@ sub run {
         assert_and_click("desktop_package_tool_update_apply", timeout => 1200);
         # Once we click that button, we can check the checkbutton
         # for restarting the computer automatically.
+        assert_screen ["desktop_package_tool_restart_automatically", "desktop_package_tool_action_select"];
+        click_lastmatch if (match_has_tag "desktop_package_tool_action_select");
         assert_and_click("desktop_package_tool_restart_automatically");
         # When we see auth_required, it means the restart has been triggered
         # and we need to authorize it

tests/toolbox.pm

@@ -37,8 +37,9 @@ sub run {
     }
     # check to see if toolbox can list container
     assert_script_run "toolbox list | grep container1";
-    # run a specific command on a given container
-    validate_script_output "toolbox run --container container1 uname -a", sub { m/Linux toolbox/ };
+    # run a specific command on a given container, note as of 2024-10
+    # the output changed from "Linux toolbox" to "Linux toolbx"
+    validate_script_output "toolbox run --container container1 uname -a", sub { m/Linux toolbo?x/ };
     # enter container to test
     type_string "toolbox enter container1\n";
     # holds on to the screen