testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Call boot_decrypt properly (function not method)

Browse Source 
Noticed in e.g. https://openqa.fedoraproject.org/tests/58798
we're doing this wrong, `boot_decrypt` was moved into utils as
a function, but we were still calling it as a method...
This commit is contained in:
Adam Williamson 2017-03-02 14:32:17 -08:00
parent 672dd40738
commit 602a1ee101
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/disk_guided_encrypted_postinstall.pm
View File

@ -9,7 +9,7 @@ sub run {
# process to run # process to run
$wait_time = 6000 if (get_var("UPGRADE")); $wait_time = 6000 if (get_var("UPGRADE"));
# decrypt disks during boot # decrypt disks during boot
$self->boot_decrypt($wait_time); boot_decrypt($wait_time);
} }
sub test_flags { sub test_flags {

4
tests/upgrade_preinstall.pm
View File

@ -7,7 +7,7 @@ sub run {
my $self = shift; my $self = shift;
# decrypt disks during boot if necessary # decrypt disks during boot if necessary
if (get_var("ENCRYPT_PASSWORD")) { if (get_var("ENCRYPT_PASSWORD")) {
$self->boot_decrypt(60); boot_decrypt(60);
} }
boot_to_login_screen; boot_to_login_screen;
@ -22,7 +22,7 @@ sub run {
# decrypt if necessary # decrypt if necessary
if (get_var("ENCRYPT_PASSWORD")) { if (get_var("ENCRYPT_PASSWORD")) {
$self->boot_decrypt(60); boot_decrypt(60);
} }
boot_to_login_screen; boot_to_login_screen;

2
tests/upgrade_run.pm
View File

@ -24,7 +24,7 @@ sub run {
# fail immediately if we see a DNF error message # fail immediately if we see a DNF error message
die "DNF reported failure" if (check_screen "upgrade_fail", 15); die "DNF reported failure" if (check_screen "upgrade_fail", 15);
if (get_var("ENCRYPT_PASSWORD")) { if (get_var("ENCRYPT_PASSWORD")) {
$self->boot_decrypt(60); boot_decrypt(60);
} }
# 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