Drop all #1821499 workaround attempts

This stuff is kinda broken in various ways and halfline thinks
he can fix the underlying bug anyway. So let's go back to just
the GNOME live test being broken for now.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-04-07 15:14:57 -07:00
parent e2fdf125b2
commit 0189b338d0

View File

@ -24,9 +24,6 @@ sub run {
$self->root_console(tty=>3); $self->root_console(tty=>3);
# ensure we actually have some package updates available # ensure we actually have some package updates available
prepare_test_packages; prepare_test_packages;
# set GDM to debugging mode; seems to be needed as part of the
# #1821499 workaround
assert_script_run 'printf "[debug]\nEnable=true\n" > /etc/gdm/custom.conf';
if ($desktop eq 'gnome') { if ($desktop eq 'gnome') {
# On GNOME, move the clock forward if needed, because it won't # On GNOME, move the clock forward if needed, because it won't
# check for updates before 6am(!) # check for updates before 6am(!)
@ -68,16 +65,6 @@ sub run {
type_very_safely get_var("USER_PASSWORD", "weakpassword"); type_very_safely get_var("USER_PASSWORD", "weakpassword");
send_key 'ret'; send_key 'ret';
} }
else {
# the "live boot" branch; we may need to work around
# https://bugzilla.redhat.com/show_bug.cgi?id=1821499
# we should wind up at desktop now, but with that bug we
# hit GDM instead
if (check_screen "graphical_login", 30) {
record_soft_failure "Hit GDM unexpectedly - #1821499";
send_key 'ret';
}
}
check_desktop_clean(tries=>30); check_desktop_clean(tries=>30);
# now, WE WAIT. this is just an unconditional wait - rather than # now, WE WAIT. this is just an unconditional wait - rather than
# breaking if we see an update notification appear - so we catch # breaking if we see an update notification appear - so we catch