From f40599ee156c2e1f5c44851f96ecd15c9ebe6f75 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 17 Dec 2018 14:27:18 -0800
Subject: [PATCH] Drop all #1594402 workarounds

I'm pretty sure we got all the bugs this was working around
fixed. Again, if not, we can put this back!

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/_boot_to_anaconda.pm      |  2 --
 tests/_do_install_and_reboot.pm | 17 -----------------
 tests/rescue_mode_encrypted.pm  | 16 +---------------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index 360adb0f..49b4b301 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -20,8 +20,6 @@ sub run {
     }
     if (get_var("ANACONDA_TEXT")) {
         $params .= "inst.text ";
-        # we need this on aarch64 till #1594402 is resolved
-        $params .= "console=tty0 " if (get_var("ARCH") eq "aarch64");
     }
     # inst.debug enables memory use tracking
     $params .= "debug" if get_var("MEMCHECK");
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 5038cd0f..339a19b6 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -91,23 +91,6 @@ sub run {
     # serial console. we don't want this, it messes up decryption
     # (as plymouth will expect the passphrase on the serial console,
     # not the virtual console). Let's go fix this up now.
-    if (get_var("ARCH") eq "aarch64") {
-        $self->root_console();
-        # somehow, by this point, localized keyboard layout has been
-        # loaded for this tty, so for French and Arabic at least we
-        # need to load the 'us' layout again for the next command to
-        # be typed correctly
-        console_loadkeys_us;
-        # stick 'console=tty0' on the end of GRUB_CMDLINE_LINUX in
-        # the grub defaults file, and 'quiet' so we don't get kernel
-        # messages, which screws up some needles. RHBZ#1594402
-        assert_script_run 'sed -i -e "s,\(GRUB_CMDLINE_LINUX.*\)\",\1 console=tty0 quiet\",g" /mnt/sysimage/etc/default/grub';
-        # regenerate the bootloader config
-        assert_script_run "chroot /mnt/sysimage grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg";
-        # let's just reboot from here, seems simplest
-        type_string "reboot\n" unless (get_var("MEMCHECK"));
-        return;
-    }
     # for the memory check test, we *don't* want to leave
     unless (get_var("MEMCHECK")) {
         assert_and_click "anaconda_install_done";
diff --git a/tests/rescue_mode_encrypted.pm b/tests/rescue_mode_encrypted.pm
index 253cd01a..565571f4 100644
--- a/tests/rescue_mode_encrypted.pm
+++ b/tests/rescue_mode_encrypted.pm
@@ -19,21 +19,7 @@ sub run {
         # select "rescue system"
         if (get_var('UEFI')) {
             send_key "down";
-            # we need this on aarch64 till #1594402 is resolved
-            if (get_var('ARCH') eq 'aarch64') {
-                send_key "e";
-                # duped with do_bootloader, sadly...
-                send_key "down";
-                sleep 1;
-                send_key "down";
-                sleep 1;
-                send_key "end";
-                type_safely " console=tty0";
-                send_key "ctrl-x";
-            }
-            else {
-                send_key "ret";
-            }
+            send_key "ret";
         }
         else {
             type_string "r\n";