srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 13:33:08 +00:00
Code Issues Releases Activity

Revert "desktop_update_graphical: try to workaround GGO #2442"

Browse Source 
This reverts commit b3e5dd41cb.
Some testing on lab seems to indicate it's not needed any more,
at least several runs with the workarounds reverted have passed.
Will put them back if we hit failures.
This commit is contained in:
Adam Williamson 2024-08-02 11:53:23 -07:00
parent 3f951b47d8
commit d515ad1195
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates.fif.json
View File

@ -1387,8 +1387,7 @@
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "desktop_update_graphical", "POSTINSTALL": "desktop_update_graphical",
"START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
"RETRY": 2
} }
}, },
"install_anaconda_text": { "install_anaconda_text": {

28
tests/desktop_update_graphical.pm
View File

@ -42,18 +42,9 @@ sub run {
# GNOME Software 44+ has a 3rd party source pop-up, get rid of it # GNOME Software 44+ has a 3rd party source pop-up, get rid of it
# if it shows up (but don't fail if it doesn't, we're not testing that) # if it shows up (but don't fail if it doesn't, we're not testing that)
if ($desktop eq 'gnome' && check_screen 'gnome_software_ignore', 10) { if ($desktop eq 'gnome' && check_screen 'gnome_software_ignore', 10) {
# keep clicking till we hit it, it tends to wobble around, wait_still_screen 3;
# especially with GNOME 46 - part of # match again as the dialog may have moved a bit
# https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2442 assert_and_click 'gnome_software_ignore';
click_lastmatch;
wait_still_screen 2;
my $count = 20;
while (check_screen 'gnome_software_ignore', 3) {
die "couldn't get rid of ignore screen!" if ($count == 0);
$count -= 1;
click_lastmatch;
wait_still_screen 2;
}
} }
# go to the 'update' interface. We may be waiting some time at a # go to the 'update' interface. We may be waiting some time at a
# 'Software catalog is being loaded' screen. # 'Software catalog is being loaded' screen.
@ -62,17 +53,8 @@ sub run {
mouse_set 10, 10; mouse_set 10, 10;
mouse_hide; mouse_hide;
} }
if ($desktop eq 'gnome') { # wait out a possible animation
# wait for it to settle, it seems to take a long time and sometimes wait_still_screen 5;
# go into 'app is not responding' mode - part of
# https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2442
wait_still_screen 10;
# try to click in a 'neutral' area of the UI to get rid of the
# weird 'short window' state - another part of
# https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2442
mouse_set 36, 128;
mouse_click;
}
assert_and_click 'desktop_package_tool_update'; assert_and_click 'desktop_package_tool_update';
# wait for things to settle if e.g. GNOME is refreshing # wait for things to settle if e.g. GNOME is refreshing
wait_still_screen 5, 90; wait_still_screen 5, 90;