srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-25 07:13:09 +00:00
Code Issues Releases Activity

Extend some boot timeouts in upgrade tests

Browse Source 
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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-05-11 08:56:47 -07:00
parent c69b01f447
commit 8754611eef
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/upgrade_preinstall.pm
View File

@ -11,12 +11,12 @@ sub run {
# handle bootloader, if requested # handle bootloader, if requested
if (get_var("GRUB_POSTINSTALL")) { 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 # decrypt if necessary
if (get_var("ENCRYPT_PASSWORD")) { if (get_var("ENCRYPT_PASSWORD")) {
boot_decrypt(60); boot_decrypt(120);
} }
boot_to_login_screen; boot_to_login_screen;

7
tests/upgrade_run.pm
View File

@ -35,14 +35,15 @@ sub run {
check_screen ["upgrade_fail", "bootloader"], 15; check_screen ["upgrade_fail", "bootloader"], 15;
die "DNF reported failure" if (match_has_tag "upgrade_fail"); 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")) { 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 # decrypt, if encrypted
if (get_var("ENCRYPT_PASSWORD")) { if (get_var("ENCRYPT_PASSWORD")) {
boot_decrypt(60); boot_decrypt(120);
# in encrypted case we need to wait a bit so postinstall test # in encrypted case we need to wait a bit so postinstall test
# doesn't bogus match on the encryption prompt we just completed # doesn't bogus match on the encryption prompt we just completed
# before it disappears from view # before it disappears from view