From ca87523a5cead3ee6246c9d622058da5a9f50e9f Mon Sep 17 00:00:00 2001
From: Lukas Ruzicka <lruzicka@redhat.com>
Date: Fri, 29 Jun 2018 11:42:11 +0200
Subject: [PATCH] Adapt for upgrade test.

---
 tests/_graphical_wait_login.pm | 6 ++++--
 tests/upgrade_preinstall.pm    | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm
index 042600a9..df9c6fc9 100644
--- a/tests/_graphical_wait_login.pm
+++ b/tests/_graphical_wait_login.pm
@@ -25,8 +25,10 @@ sub run {
         }
         $wait_time = 300;
     }
-    # Wait for the login screen
-    boot_to_login_screen(timeout => $wait_time);
+    # Wait for the login screen unless it is not already booted
+    unless (get_var("ASSUME_BOOT")) { 
+        boot_to_login_screen(timeout => $wait_time);
+    }
     # GDM 3.24.1 dumps a cursor in the middle of the screen here...
     mouse_hide;
     # do user login unless USER_LOGIN is set to string 'false'
diff --git a/tests/upgrade_preinstall.pm b/tests/upgrade_preinstall.pm
index 0e329a58..e5bcf2ee 100644
--- a/tests/upgrade_preinstall.pm
+++ b/tests/upgrade_preinstall.pm
@@ -26,6 +26,9 @@ sub run {
     assert_script_run $update_command, 600;
 }
 
+if (get_var("ASSUME_BOOT")) {
+    desktop_vt;
+}
 
 sub test_flags {
     return { fatal => 1 };