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

Fix a logic bug in the 1699099 workaround which broke lots

Browse Source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-04-13 07:56:57 -07:00
parent d33aa591a6
commit 2e68250bb1
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/_do_install_and_reboot.pm
View File

@ -84,7 +84,8 @@ sub run {
# Wait for install to end. Give Rawhide a bit longer, in case # Wait for install to end. Give Rawhide a bit longer, in case
# we're on a debug kernel, debug kernel installs are really slow. # we're on a debug kernel, debug kernel installs are really slow.
my $timeout = 1800; my $timeout = 1800;
if (lc(get_var('VERSION')) eq "rawhide") { my $version = lc(get_var('VERSION');
if ($version) eq "rawhide") {
$timeout = 2400; $timeout = 2400;
} }
# workstation especially has an unfortunate habit of kicking in # workstation especially has an unfortunate habit of kicking in
@ -130,8 +131,7 @@ sub run {
$self->root_console(timeout=>30); $self->root_console(timeout=>30);
enable_abrt_and_quit(); enable_abrt_and_quit();
} }
elsif (get_var("VERSION") eq "30" || get_var("VERSION") eq "Rawhide") { elsif ((get_var("DESKTOP") eq "gnome") && ($version eq "30" || $version eq "rawhide")) {
if (get_var("DESKTOP") eq "gnome") {
# FIXME workaround for # FIXME workaround for
# https://bugzilla.redhat.com/show_bug.cgi?id=1699099 # https://bugzilla.redhat.com/show_bug.cgi?id=1699099
# remove when fixed # remove when fixed
@ -139,7 +139,6 @@ sub run {
assert_script_run 'sed -i -e "s,SELINUX=enforcing,SELINUX=permissive,g" /mnt/sysimage/etc/selinux/config'; assert_script_run 'sed -i -e "s,SELINUX=enforcing,SELINUX=permissive,g" /mnt/sysimage/etc/selinux/config';
type_string "reboot\n" unless (get_var("LIVE")); type_string "reboot\n" unless (get_var("LIVE"));
} }
}
else { else {
assert_and_click "anaconda_install_done"; assert_and_click "anaconda_install_done";
} }