From 22c0b5bc047d0b96adafc84154e46ccacef9d48a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Oct 12 2018 22:36:55 +0000
Subject: Disable hidden grub menu for uploaded base installs


At least one test (desktop_notifications_postinstall) boots from
the disk image uploaded by install_default_upload, and needs to
access the grub menu. On F29+ Workstation this is failing,
because the grub menu is now hidden by default, so when the test
boots, it never sees the bootloader screen, and fails.

I considered trying to teach it to hold down shift or hit f8 or
esc at the right time, but that seems like it might be hard. So
instead let's just try to disable the hidden menu when we're
about to upload the installed system image. This is kinda going
against the 'preserve natural system behaviour' principle we try
to use for openQA, but I think it's OK as we do have other tests
that will exercise the 'hidden boot menu' stuff to some extent.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/tests/_console_shutdown.pm b/tests/_console_shutdown.pm
index 3acaa1f..e9cbbc6 100644
--- a/tests/_console_shutdown.pm
+++ b/tests/_console_shutdown.pm
@@ -11,6 +11,10 @@ sub run {
     # console and run 'poweroff'. We can write separate tests for
     # properly testing shutdown/reboot/log out from desktops.
     $self->root_console(tty=>4);
+    # disable the hidden grub menu on Workstation, so post-install
+    # tests that need to edit boot params will see it. Don't use
+    # assert_script_run as this will fail when it's not set
+    script_run("grub2-editenv - unset menu_auto_hide", 0);
     script_run("poweroff", 0);
     assert_shutdown 180;
 }