From 453053f4ed4d1c41d19a02abb52fd0d7af94a696 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 24 Aug 2021 15:14:22 -0700 Subject: [PATCH] gnome-initial-setup: work around #1997310 (GOA screen missing) There's a bug in current F35/Rawhide which causes the GOA screen in g-i-s not to show up. Since failing on that will block a lot of testing, let's handle it as a soft failure. Signed-off-by: Adam Williamson --- lib/utils.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index a7c0310d..da69bd97 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -768,10 +768,18 @@ sub gnome_initial_setup { } } unless (get_var("VNC_CLIENT")) { - # click 'Skip' one time (this is the 'goa' screen). We don't - # get it on VNC_CLIENT case as network isn't working (yet) + # We should be at the GOA screen, except on VNC_CLIENT case + # where network isn't working yet. click 'Skip' one time. If + # it's not visible we may have hit + # https://bugzilla.redhat.com/show_bug.cgi?id=1997310 , which + # we'll handle as a soft failure mouse_set(100,100); - wait_screen_change { assert_and_click "skip_button"; }; + if (check_screen "skip_button", 60) { + wait_screen_change { click_lastmatch; }; + } + else { + record_soft_failure "GOA screen not seen! Likely RHBZ #1997310"; + } } send_key "ret"; if ($args{prelogin}) {