testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-22 05:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

desktop_login: update reboot flow for GNOME changes in F33+

Browse Source 
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>
This commit is contained in:
Adam Williamson 2020-08-17 16:12:48 -07:00
parent 8ee330b5d3
commit 7682872d95
4 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
needles/gnome/reboot_entry-20200817.json Normal file
View File

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

BIN
needles/gnome/reboot_entry-20200817.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

5
needles/kde/logout_confirm_kde.json
View File

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

15
tests/desktop_login.pm
View File

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