Fix sporadic errors in test_results due to tutorial popup

os-autoinst · Jun 3, 2020 · 24ee327 · 24ee327
1 parent a3aa6a4
commit 24ee327
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/tests/openqa/webui/test_results.pm b/tests/openqa/webui/test_results.pm
@@ -38,6 +38,12 @@ sub upload_autoinst_log {
 
 sub handle_notify_popup {
     return undef unless match_has_tag 'openqa-dont-notify-me';
+    for my $i (1 .. 5) {
+        assert_and_click 'openqa-dont-notify-me';
+        if (check_screen('openqa-tutorial-confirm')) {
+            last;
+        }
+    }
     assert_and_click 'openqa-tutorial-confirm';
     assert_screen 'openqa-tutorial-closed';
     $tutorial_disabled = 1;
@@ -50,13 +56,10 @@ sub run {
     # of the running job
     $tutorial_disabled = 0;
     assert_screen with_optional_tutorial_popup 'openqa-tests';
-    click_lastmatch;
     handle_notify_popup and assert_and_click 'openqa-tests';
     assert_screen with_optional_tutorial_popup 'openqa-job-minimalx';
-    click_lastmatch;
     handle_notify_popup and assert_and_click 'openqa-job-minimalx';
     assert_screen with_optional_tutorial_popup 'openqa-job-details';
-    click_lastmatch;
     handle_notify_popup;
     assert_screen 'openqa-testresult', 600;
 }