From 0c63065ebd855cbdb90483a0a6fceeeb0ade32c0 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 5 Mar 2019 07:35:11 -0800
Subject: [PATCH] Add the #1674045 workaround to one more place

Sigh, so much copypasta makes me sad, should've factored it out.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 lib/utils.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/utils.pm b/lib/utils.pm
index 9bd17a0e..0c9b610d 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -238,7 +238,19 @@ sub do_bootloader {
     # sure we actually did a UEFI boot
     my $boottag = "bootloader_bios";
     $boottag = "bootloader_uefi" if ($args{uefi});
-    assert_screen $boottag, $args{timeout};
+    assert_screen [$boottag, "upgrade_complete"], $args{timeout};
+    if (match_has_tag "upgrade_complete") {
+        # this is a workaround for RHBZ #1674045 during upgrades
+        # let's check we didn't just happen to catch it for the
+        # brief time it's displayed normally...
+        sleep 10;
+        if (check_screen "upgrade_complete") {
+            record_soft_failure "Upgrade hung at end - probably RHBZ #1674045";
+            power 'reset';
+        }
+        # now let's just assume we'll get to the bootloader soon
+        assert_screen $boottag, 60;
+    }
     if ($args{mutex}) {
         # cancel countdown
         send_key "left";