From 37f597229ad7576160f3f9debb0487bcff61d6a2 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 20 Mar 2020 13:48:40 -0700
Subject: [PATCH] Boxes: drop RHBZ #1692972 workaround, fix for <F32

RHBZ #1692972 was fixed long ago, so we don't need to worry
about that any more. But this test failed on the recent F31 live
respin compose because it was changed to assume the tutorial
would appear on startup, which only happens on F32+. To make the
test work on F31 respins, let's handle both paths. Once F32 is
stable we can drop this as we won't run the test on F31 any more
after that.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/apps_startstop/gnome/boxes.pm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/tests/apps_startstop/gnome/boxes.pm b/tests/apps_startstop/gnome/boxes.pm
index 9e0bc474..c8d92eff 100644
--- a/tests/apps_startstop/gnome/boxes.pm
+++ b/tests/apps_startstop/gnome/boxes.pm
@@ -10,20 +10,14 @@ sub run {
     
     # Start the application
     start_with_launcher('apps_menu_boxes');
-    # handling 'auth required' screen appearing as a soft fail,
-    # check that is started
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1692972
-    assert_screen ['apps_boxes_tutorial', 'auth_required'];
-    if (match_has_tag 'auth_required') {
-        record_soft_failure "Firewall authentication screen appeared - RHBZ #1692972";
-        my $user_password = get_var("USER_PASSWORD") || "weakpassword";
-        type_very_safely $user_password;
-        send_key 'ret';
-        assert_screen 'apps_boxes_tutorial';
+    # We get tutorial on F32+, directly to main UI on F<32; we can
+    # drop the 'direct to main UI' path once F32 is stable
+    assert_screen ['apps_boxes_tutorial', 'apps_run_boxes'];
+    if (match_has_tag 'apps_boxes_tutorial') {
+        # Let us get rid of the Tutorial window.
+        send_key 'esc';
+        assert_screen 'apps_run_boxes';
     }
-    # Let us get rid of the Tutorial window.
-    send_key 'esc';
-    assert_screen 'apps_run_boxes';
 
     # Register application
     register_application("gnome-boxes");