From f09330e897d49989a9356ab651d3bcba45a1baa7 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mar 09 2018 23:22:29 +0000
Subject: Work around RHBZ #1553807 by checking if anaconda still running


This is the best workaround I can think of for RHBZ #1553807 -
just check (in the 60 second 'move the mouse' loop) if anaconda
is still running, based on whether its icon is in the top bar
(on Workstation live installs only, obviously).

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 4674398..2fec8ff 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -83,15 +83,26 @@ sub run {
         # move the mouse a bit
         mouse_set 100, 100;
         mouse_hide;
+        # https://bugzilla.redhat.com/show_bug.cgi?id=1553935 - see
+        # if anaconda disappeared in the last 60 seconds...
+        if (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
+            last unless (check_screen "workstation_install_running", 1);
+        }
         last if (check_screen "anaconda_install_done", $interval);
         $timeout -= $interval;
     }
-    assert_screen "anaconda_install_done";
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1553935
+    unless (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
+        assert_screen "anaconda_install_done";
+    }
     # wait for transition to complete so we don't click in the sidebar
     wait_still_screen 3;
     # for the memory check test, we *don't* want to leave
     unless (get_var("MEMCHECK")) {
-        assert_and_click "anaconda_install_done";
+        # https://bugzilla.redhat.com/show_bug.cgi?id=1553935
+        unless (get_var("LIVE") && get_var("DESKTOP" eq 'gnome')) {
+            assert_and_click "anaconda_install_done";
+        }
         if (get_var('LIVE')) {
             # reboot from a console, it's more reliable than the desktop
             # runners