From 8754611eef21ff66c7a4585dccfb54502ac5f5cd Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 11 May 2018 08:56:47 -0700 Subject: [PATCH] Extend some boot timeouts in upgrade tests Sometimes rebooting during upgrade tests seems to take longer than these timeouts allow, so let's bump them a bit. Signed-off-by: Adam Williamson --- tests/upgrade_preinstall.pm | 4 ++-- tests/upgrade_run.pm | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/upgrade_preinstall.pm b/tests/upgrade_preinstall.pm index 2b5788e8..0e329a58 100644 --- a/tests/upgrade_preinstall.pm +++ b/tests/upgrade_preinstall.pm @@ -11,12 +11,12 @@ sub run { # handle bootloader, if requested if (get_var("GRUB_POSTINSTALL")) { - do_bootloader(postinstall=>1, params=>get_var("GRUB_POSTINSTALL")); + do_bootloader(postinstall=>1, params=>get_var("GRUB_POSTINSTALL"), timeout=>120); } # decrypt if necessary if (get_var("ENCRYPT_PASSWORD")) { - boot_decrypt(60); + boot_decrypt(120); } boot_to_login_screen; diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm index 101d3daf..b578c762 100644 --- a/tests/upgrade_run.pm +++ b/tests/upgrade_run.pm @@ -35,14 +35,15 @@ sub run { check_screen ["upgrade_fail", "bootloader"], 15; die "DNF reported failure" if (match_has_tag "upgrade_fail"); - # handle bootloader, if requested + # handle bootloader, if requested; set longer timeout as sometimes + # reboot here seems to take a long time if (get_var("GRUB_POSTINSTALL")) { - do_bootloader(postinstall=>1, params=>get_var("GRUB_POSTINSTALL")); + do_bootloader(postinstall=>1, params=>get_var("GRUB_POSTINSTALL"), timeout=>120); } # decrypt, if encrypted if (get_var("ENCRYPT_PASSWORD")) { - boot_decrypt(60); + boot_decrypt(120); # 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