Handle GNOME 40 now starting at overview, not desktop

For consistency, let's just return to the desktop right away. We
also need to handle closing the overview before running installer
on live image boot.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-03-04 15:24:54 -08:00
parent 4758782d56
commit 1e5d767fa3
6 changed files with 42 additions and 1 deletions

View File

@ -856,6 +856,9 @@ sub check_desktop {
@_ @_
); );
assert_screen "apps_menu_button", $args{timeout}; assert_screen "apps_menu_button", $args{timeout};
# GNOME 40 starts on the overview by default; for consistency with
# older GNOME and KDE, let's just close it
send_key "alt-f1" if match_has_tag "apps_menu_button_active";
} }
sub download_modularity_tests { sub download_modularity_tests {

View File

@ -0,0 +1,19 @@
{
"area": [
{
"height": 15,
"ypos": 9,
"xpos": 15,
"width": 67,
"type": "match"
}
],
"properties": [],
"tags": [
"DESKTOP-gnome",
"ENV-DISTRI-fedora",
"LANGUAGE-english",
"apps_menu_button",
"apps_menu_button_active"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 447 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"type": "match",
"width": 56,
"ypos": 422,
"height": 41,
"xpos": 402
}
],
"properties": [],
"tags": [
"graphical_login_input",
"DESKTOP-gnome",
"LANGUAGE-english"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -113,7 +113,9 @@ sub run {
else { else {
# on lives, we have to explicitly launch anaconda # on lives, we have to explicitly launch anaconda
if (get_var('LIVE')) { if (get_var('LIVE')) {
assert_and_click("live_start_anaconda_icon", timeout=>300); assert_screen ["live_start_anaconda_icon", "apps_menu_button_active"], 300;
send_key "alt-f1" if match_has_tag "apps_menu_button_active";
assert_and_click("live_start_anaconda_icon");
unless (check_screen "anaconda_select_install_lang", 180) { unless (check_screen "anaconda_select_install_lang", 180) {
# click it again - on KDE since 2019-10 or so it seems # click it again - on KDE since 2019-10 or so it seems
# like the first attempt sometimes just doesn't work # like the first attempt sometimes just doesn't work