From 7682872d95f39380d57838cb75bb535999bd34e2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 17 Aug 2020 16:12:48 -0700 Subject: [PATCH] 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 --- needles/gnome/reboot_entry-20200817.json | 15 +++++++++++++++ needles/gnome/reboot_entry-20200817.png | Bin 0 -> 24727 bytes needles/kde/logout_confirm_kde.json | 5 +++-- tests/desktop_login.pm | 15 ++++++++------- 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 needles/gnome/reboot_entry-20200817.json create mode 100644 needles/gnome/reboot_entry-20200817.png diff --git a/needles/gnome/reboot_entry-20200817.json b/needles/gnome/reboot_entry-20200817.json new file mode 100644 index 00000000..bfd8e1ff --- /dev/null +++ b/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" + ] +} diff --git a/needles/gnome/reboot_entry-20200817.png b/needles/gnome/reboot_entry-20200817.png new file mode 100644 index 0000000000000000000000000000000000000000..17cf56099bd387a3d8ea6dba03f66fa61fba27d3 GIT binary patch literal 24727 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 literal 0 HcmV?d00001 diff --git a/needles/kde/logout_confirm_kde.json b/needles/kde/logout_confirm_kde.json index 1600f584..06cdc78b 100644 --- a/needles/kde/logout_confirm_kde.json +++ b/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" } ] -} \ No newline at end of file +} diff --git a/tests/desktop_login.pm b/tests/desktop_login.pm index 34b89482..d252860c 100644 --- a/tests/desktop_login.pm +++ b/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