Tweak the workaround yet again (with soft fail this time)

Sigh, sorry, just perfecting. This way it won't fail when the
bug is fixed (hopefully).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-09-06 20:36:29 -07:00
parent 7dff1843db
commit e2eb794a87

View File

@ -70,23 +70,23 @@ sub run {
} }
} }
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. Also,
# FIXME 2018-09: #1625572 means g-i-s 'first login' mode runs # FIXME 2018-09: #1625572 means g-i-s 'first login' mode runs
# after 'user creation' mode on F29 and Rawhide install tests, # after 'user creation' mode on F29 and Rawhide install tests,
# even though it shouldn't. Drop this conditional and just do # even though it shouldn't. So, let's check for that too.
# getting_started once 1625572 is fixed if (check_screen ["next_button", "getting_started"], 120) {
if ($version > 28 || $version eq "Rawhide") { if (match_has_tag "getting_started") {
gnome_initial_setup();
}
else {
# wait for the stupid 'help' screen to show and kill it
if (check_screen "getting_started", 30) {
send_key "alt-f4"; send_key "alt-f4";
wait_still_screen 5; wait_still_screen 5;
} }
else { else {
record_soft_failure "'getting started' missing (probably BGO#790811)"; record_soft_failure "gnome-initial-setup ran in both modes, probably RHBZ#1625572";
gnome_initial_setup();
} }
} }
else {
record_soft_failure "'getting started' missing (probably BGO#790811)";
}
} }
# Move the mouse somewhere it won't highlight the match areas # Move the mouse somewhere it won't highlight the match areas