From b2139bf2ddd68d44db528735d5f8bedf30c6c2e2 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 24 Jan 2020 12:30:58 +0100
Subject: [PATCH] Fully fix the reboot unmount test

OK, we need to define $self. And we're also gonna need to login
a bit harder later too.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/base_reboot_unmount.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/base_reboot_unmount.pm b/tests/base_reboot_unmount.pm
index a1dd1def..fe8e74f1 100644
--- a/tests/base_reboot_unmount.pm
+++ b/tests/base_reboot_unmount.pm
@@ -17,6 +17,7 @@ sub test_routine {
 }
 
 sub run {
+    my $self = shift;
     bypass_1691487 unless (get_var("DESKTOP"));
     # switch to TTY3 for both graphical and console tests
     $self->root_console(tty=>3);
@@ -26,7 +27,7 @@ sub run {
     type_safely "reboot\n";
     # This time, we will need to login manually.
     boot_to_login_screen;
-    console_login;
+    $self->root_console(tty=>3);
 
     # Run the tests for the second time.
     test_routine();