desktop_login: update reboot flow for GNOME changes in F33+

GNOME now also splits 'Restart...' and 'Power Off...' as KDE
does, so we need to tweak the conditional and add some needles.

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

needles/gnome/reboot_entry-20200817.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 757,
+      "height": 19,
+      "ypos": 227,
+      "type": "match",
+      "width": 67
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "reboot_entry"
+  ]
+}

needles/kde/logout_confirm_kde.json

@@ -2,7 +2,8 @@
   "properties": [],
   "tags": [
     "log_out_confirm",
-    "power_off_confirm"
+    "power_off_confirm",
+    "restart_confirm"
   ],
   "area": [
     {
@@ -13,4 +14,4 @@
       "type": "match"
     }
   ]
-}
+}

tests/desktop_login.pm

@@ -165,18 +165,19 @@ sub reboot_system {
         # we can access the operationg system switching controls.
         assert_and_click "system_menu_button";
         assert_and_click "power_entry";
-        if ($desktop eq "gnome") {
-            # In Gnome, some of the entries are brought together, while in KDE they are
-            # split and it does not seem correct to me to assign restarting tags to
-            # needles powering off the machine. So I split this for KDE and Gnome.
-            # This holds true for Gnome:
+        my $relnum = get_release_number;
+        if ($desktop eq "gnome" && $relnum < 33) {
+            # In GNOME before F33, some of the entries are brought together, while
+            # in KDE and GNOME from F33 onwards they are split and it does not seem
+            # correct to me to assign restarting tags to needles powering off the
+            # machine. So I split this for KDE and GNOME < F33:
             assert_and_click "power_off_entry";
             assert_and_click "restart_confirm";
         }
         else {
-            # And for KDE:
+            # And for KDE and GNOME >= F33:
             assert_and_click "reboot_entry";
-            assert_and_click "log_out_confirm";
+            assert_and_click "restart_confirm";
         }
     }
     # When we are outside KDE (not logged in), the only way to reboot is to click