From 2e68250bb182288a0c3f2ac533019fa7aa7eaffc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 13 Apr 2019 07:56:57 -0700 Subject: [PATCH] Fix a logic bug in the 1699099 workaround which broke lots Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index a92884de..c69b54a1 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -84,7 +84,8 @@ sub run { # Wait for install to end. Give Rawhide a bit longer, in case # we're on a debug kernel, debug kernel installs are really slow. my $timeout = 1800; - if (lc(get_var('VERSION')) eq "rawhide") { + my $version = lc(get_var('VERSION'); + if ($version) eq "rawhide") { $timeout = 2400; } # workstation especially has an unfortunate habit of kicking in @@ -130,15 +131,13 @@ sub run { $self->root_console(timeout=>30); enable_abrt_and_quit(); } - elsif (get_var("VERSION") eq "30" || get_var("VERSION") eq "Rawhide") { - if (get_var("DESKTOP") eq "gnome") { - # FIXME workaround for - # https://bugzilla.redhat.com/show_bug.cgi?id=1699099 - # remove when fixed - $self->root_console(timeout=>30); - 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")); - } + elsif ((get_var("DESKTOP") eq "gnome") && ($version eq "30" || $version eq "rawhide")) { + # FIXME workaround for + # https://bugzilla.redhat.com/show_bug.cgi?id=1699099 + # remove when fixed + $self->root_console(timeout=>30); + 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")); } else { assert_and_click "anaconda_install_done";