Rejig the 1625572 workaround to just use an existing conditional
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
af6b9b15aa
commit
211cc221b3
@ -65,24 +65,25 @@ sub run {
|
||||
# as this test gets loaded twice on the ADVISORY flow, and
|
||||
# we might be on the INSTALL_NO_USER flow, check whether
|
||||
# this happened already
|
||||
# FIXME 2018-09: #1625572 means g-i-s 'first login' mode runs
|
||||
# after 'user creation' mode on F29 and Rawhide install tests,
|
||||
# even though it shouldn't. Go back to the simpler line
|
||||
# commented below when that bug is fixed
|
||||
# unless (get_var("_setup_done")) {
|
||||
if (!get_var("_setup_done") || (($version > 28 || $version eq "Rawhide") && get_var("INSTALL_NO_USER"))) {
|
||||
unless (get_var("_setup_done")) {
|
||||
gnome_initial_setup();
|
||||
}
|
||||
}
|
||||
if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
|
||||
# FIXME 2018-09: #1625572 means g-i-s 'first login' mode runs
|
||||
# after 'user creation' mode on F29 and Rawhide install tests,
|
||||
# even though it shouldn't. Go back to the commented-out lines
|
||||
# when this is fixed
|
||||
gnome_initial_setup();
|
||||
|
||||
# wait for the stupid 'help' screen to show and kill it
|
||||
if (check_screen "getting_started", 30) {
|
||||
send_key "alt-f4";
|
||||
wait_still_screen 5;
|
||||
}
|
||||
else {
|
||||
record_soft_failure "'getting started' missing (probably BGO#790811)";
|
||||
}
|
||||
#if (check_screen "getting_started", 30) {
|
||||
# send_key "alt-f4";
|
||||
# wait_still_screen 5;
|
||||
#}
|
||||
#else {
|
||||
# record_soft_failure "'getting started' missing (probably BGO#790811)";
|
||||
#}
|
||||
}
|
||||
|
||||
# Move the mouse somewhere it won't highlight the match areas
|
||||
|
Loading…
Reference in New Issue
Block a user