From 36181eea76c83deb05d6a099a50f4213db2840ff Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 1 Apr 2020 10:34:50 -0700 Subject: [PATCH] Fix 'actions' ordering after last commit I merged the previous commit before realizing the ordering was wrong. All other 'actions' lines have to come *before* the one that adds 'reboot', because one of the conditions for that is whether @actions is populated - basically, if we're taking any actions, we also have to reboot afterwards. If we add an action *after* that line (but no actions were added before that line), we'll do it but then not reboot and the test will break. Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index 3ecca96b..5d2fb3ce 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -138,13 +138,13 @@ sub run { # memcheck test doesn't need to reboot at all. Rebooting from GUI # for lives is unreliable. And if we're already doing something # else at a console, we may as well reboot from there too - push (@actions, 'reboot') if (!get_var("MEMCHECK") && (get_var("LIVE") || @actions)); # Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1817004 # Allow ppc64le Silverblue to boot after install if ((get_var("ARCH") eq 'ppc64le') && \ (get_var("SUBVARIANT") eq "Silverblue")) { push (@actions, 'grubregen'); } + push (@actions, 'reboot') if (!get_var("MEMCHECK") && (get_var("LIVE") || @actions)); # our approach for taking all these actions doesn't work on VNC # installs, fortunately we don't need any of them in that case # yet, so for now let's just flush the list here if we're VNC