From e1a6d2c22b389799905890805522e7f2b08d1eb4 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Feb 26 2021 00:10:20 +0000
Subject: Handle KDE defaulting to offline updates in F34+


We need to hit 'restart' after applying updates, and we also
need the 'done' needle *not* to match the restart message, so
change that to match on the text (unfortunately). That also
means we have to add another variant of the needle for F32 as
the background of the text is a different color there.

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

---

diff --git a/needles/kde/desktop_package_tool_update_done-f32-20210226.json b/needles/kde/desktop_package_tool_update_done-f32-20210226.json
new file mode 100644
index 0000000..074f139
--- /dev/null
+++ b/needles/kde/desktop_package_tool_update_done-f32-20210226.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 651,
+      "height": 17,
+      "width": 134,
+      "type": "match",
+      "xpos": 656
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_package_tool_update_done"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/desktop_package_tool_update_done-f32-20210226.png b/needles/kde/desktop_package_tool_update_done-f32-20210226.png
new file mode 100644
index 0000000..8dc3996
Binary files /dev/null and b/needles/kde/desktop_package_tool_update_done-f32-20210226.png differ
diff --git a/needles/kde/desktop_package_tool_update_done.json b/needles/kde/desktop_package_tool_update_done.json
index 0e988cd..59863c8 100644
--- a/needles/kde/desktop_package_tool_update_done.json
+++ b/needles/kde/desktop_package_tool_update_done.json
@@ -1,11 +1,11 @@
 {
     "area": [
         {
-            "height": 24,
+            "height": 14,
             "type": "match",
-            "width": 21,
-            "xpos": 644,
-            "ypos": 675
+            "width": 141,
+            "xpos": 684,
+            "ypos": 670
         }
     ],
     "properties": [],
diff --git a/needles/kde/kde_offline_update_reboot-20210225.json b/needles/kde/kde_offline_update_reboot-20210225.json
new file mode 100644
index 0000000..573461b
--- /dev/null
+++ b/needles/kde/kde_offline_update_reboot-20210225.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 929,
+      "ypos": 661,
+      "height": 15,
+      "type": "match",
+      "width": 48
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "kde_offline_update_reboot"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/kde_offline_update_reboot-20210225.png b/needles/kde/kde_offline_update_reboot-20210225.png
new file mode 100644
index 0000000..075c07a
Binary files /dev/null and b/needles/kde/kde_offline_update_reboot-20210225.png differ
diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm
index cb7ea0d..02e8f9f 100644
--- a/tests/desktop_update_graphical.pm
+++ b/tests/desktop_update_graphical.pm
@@ -7,6 +7,7 @@ use packagetest;
 sub run {
     my $self = shift;
     my $desktop = get_var('DESKTOP');
+    my $relnum = get_release_number;
     # use a tty console for repo config and package prep
     $self->root_console(tty=>3);
     assert_script_run 'dnf config-manager --set-disabled updates-testing';
@@ -86,6 +87,11 @@ sub run {
         }
         boot_to_login_screen;
     }
+    elsif ($desktop eq 'kde' && $relnum > 33) {
+        # KDE does offline updates now, we have to trigger the reboot
+        assert_and_click 'kde_offline_update_reboot';
+        boot_to_login_screen;
+    }
     else {
         assert_screen 'desktop_package_tool_update_done', 180;
     }