testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Remove old workaround for g-i-s failing to run on F26

Browse Source 
This hasn't been a problem for ages.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-09-06 17:43:32 -07:00
parent cc2f1a3cec
commit c62a04bac8
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/_graphical_wait_login.pm
View File

@ -59,26 +59,10 @@ sub run {
if (get_var("DESKTOP") eq 'gnome' && (get_var("ADVISORY") || !get_var("START_AFTER_TEST"))) { if (get_var("DESKTOP") eq 'gnome' && (get_var("ADVISORY") || !get_var("START_AFTER_TEST"))) {
# as this test gets loaded twice on the ADVISORY flow, and # as this test gets loaded twice on the ADVISORY flow, and
# we might be on the INSTALL_NO_USER flow, check whether # we might be on the INSTALL_NO_USER flow, check whether
# this happened already. Also, as of 2017-10 there's a bug # this happened already
# in the F26 base image which stops g-i-s running at all;
# for update and upgrade testing purposes we don't want to
# fail, we just want to go ahead. So if we see the
# getting_started screen, just handle that instead.
unless (get_var("_setup_done")) { unless (get_var("_setup_done")) {
if (get_var("ADVISORY") || get_var("UPGRADE")) {
assert_screen ["next_button", "getting_started"], 120;
if (match_has_tag("next_button")) {
gnome_initial_setup(); gnome_initial_setup();
} }
else {
send_key "alt-f4";
set_var("_setup_done", 1);
}
}
else {
gnome_initial_setup();
}
}
} }
if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
# wait for the stupid 'help' screen to show and kill it # wait for the stupid 'help' screen to show and kill it