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

Fix 'actions' ordering after last commit

Browse Source 
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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-04-01 10:34:50 -07:00
parent 8d7be9a227
commit 36181eea76
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/_do_install_and_reboot.pm
View File

@ -138,13 +138,13 @@ sub run {
# memcheck test doesn't need to reboot at all. Rebooting from GUI # memcheck test doesn't need to reboot at all. Rebooting from GUI
# for lives is unreliable. And if we're already doing something # for lives is unreliable. And if we're already doing something
# else at a console, we may as well reboot from there too # 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 # Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1817004
# Allow ppc64le Silverblue to boot after install # Allow ppc64le Silverblue to boot after install
if ((get_var("ARCH") eq 'ppc64le') && \ if ((get_var("ARCH") eq 'ppc64le') && \
(get_var("SUBVARIANT") eq "Silverblue")) { (get_var("SUBVARIANT") eq "Silverblue")) {
push (@actions, 'grubregen'); 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 # our approach for taking all these actions doesn't work on VNC
# installs, fortunately we don't need any of them in that case # 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 # yet, so for now let's just flush the list here if we're VNC