testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Complete separation of g-i-s next_button and start_setup

Browse Source 
Previous attempt was incomplete, didn't actually handle the first
click.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-12-21 12:51:50 -08:00
parent 8cca936926
commit b9cbd6f28f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/utils.pm
View File

@ -701,7 +701,7 @@ sub gnome_initial_setup {
if (match_has_tag("auth_required")) { if (match_has_tag("auth_required")) {
record_soft_failure "Unexpected authentication required: https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/106"; record_soft_failure "Unexpected authentication required: https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/106";
send_key "esc"; send_key "esc";
assert_screen "next_button"; assert_screen ["next_button", "start_setup"];
} }
# wait a bit in case of animation # wait a bit in case of animation
wait_still_screen 3; wait_still_screen 3;
@ -717,7 +717,16 @@ sub gnome_initial_setup {
# highlight problems, sleeping to give it time to get # highlight problems, sleeping to give it time to get
# to the next screen between clicks # to the next screen between clicks
mouse_set(100, 100); mouse_set(100, 100);
if ($n == 1) {
# only accept start_setup one time, to avoid matching
# on it during transition to next screen. also accept
# next_button as in per-user mode, first screen has that
# not start_setup
wait_screen_change { assert_and_click ["next_button", "start_setup"]; };
}
else {
wait_screen_change { assert_and_click "next_button"; }; wait_screen_change { assert_and_click "next_button"; };
}
# for Japanese, we need to workaround a bug on the keyboard # for Japanese, we need to workaround a bug on the keyboard
# selection screen # selection screen
if ($n == 1 && get_var("LANGUAGE") eq 'japanese') { if ($n == 1 && get_var("LANGUAGE") eq 'japanese') {