From 602a1ee10108ff52ca7d8688abca2b2f39f4826d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 2 Mar 2017 14:32:17 -0800
Subject: [PATCH] Call `boot_decrypt` properly (function not method)

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...
---
 tests/disk_guided_encrypted_postinstall.pm | 2 +-
 tests/upgrade_preinstall.pm                | 4 ++--
 tests/upgrade_run.pm                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/disk_guided_encrypted_postinstall.pm b/tests/disk_guided_encrypted_postinstall.pm
index 0c8cc70b..de2237f0 100644
--- a/tests/disk_guided_encrypted_postinstall.pm
+++ b/tests/disk_guided_encrypted_postinstall.pm
@@ -9,7 +9,7 @@ sub run {
     # process to run
     $wait_time = 6000 if (get_var("UPGRADE"));
     # decrypt disks during boot
-    $self->boot_decrypt($wait_time);
+    boot_decrypt($wait_time);
 }
 
 sub test_flags {
diff --git a/tests/upgrade_preinstall.pm b/tests/upgrade_preinstall.pm
index e6086d2a..ac3174a3 100644
--- a/tests/upgrade_preinstall.pm
+++ b/tests/upgrade_preinstall.pm
@@ -7,7 +7,7 @@ sub run {
     my $self = shift;
     # decrypt disks during boot if necessary
     if (get_var("ENCRYPT_PASSWORD")) {
-        $self->boot_decrypt(60);
+        boot_decrypt(60);
     }
 
     boot_to_login_screen;
@@ -22,7 +22,7 @@ sub run {
 
     # decrypt if necessary
     if (get_var("ENCRYPT_PASSWORD")) {
-        $self->boot_decrypt(60);
+        boot_decrypt(60);
     }
 
     boot_to_login_screen;
diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm
index b3869d43..8e62fdcb 100644
--- a/tests/upgrade_run.pm
+++ b/tests/upgrade_run.pm
@@ -24,7 +24,7 @@ sub run {
     # fail immediately if we see a DNF error message
     die "DNF reported failure" if (check_screen "upgrade_fail", 15);
     if (get_var("ENCRYPT_PASSWORD")) {
-        $self->boot_decrypt(60);
+        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