From 67cb387e9adb307c1f9807f8710913bf064714fc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 29 Aug 2016 11:45:34 -0700 Subject: [PATCH] drop RHBZ #1349721 workaround, as the bug is fixed Summary: Pretty simple! Test Plan: Check the upgrade tests work the same as before the change. Reviewers: jskladan, garretraziel Reviewed By: garretraziel Subscribers: tflink Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D979 --- tests/upgrade_run.pm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm index c1f8c0e2..daf389d5 100644 --- a/tests/upgrade_run.pm +++ b/tests/upgrade_run.pm @@ -19,21 +19,6 @@ sub run { if (get_var("ENCRYPT_PASSWORD")) { $self->boot_decrypt(60); } - # try and catch if we hit RHBZ #1349721 and work around it - if (check_screen "bootloader") { - # wait some secs for the screen to clear - sleep 10; - if (get_var("ENCRYPT_PASSWORD")) { - $self->boot_decrypt(60); - } - if (check_screen "bootloader") { - record_soft_failure; - $self->do_bootloader(postinstall=>1, params=>"enforcing=0"); - if (get_var("ENCRYPT_PASSWORD")) { - $self->boot_decrypt(60); - } - } - } # in encrypted case we need to wait a bit so postinstall test # doesn't bogus match on the encryption prompt we just completed # before it disappears from view