From 81d6db802f0774dd7a00569aeca7be275894a635 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 18 Feb 2021 09:56:34 -0800 Subject: [PATCH] ...yup, I durn goofed. Share properly, kids! Signed-off-by: Adam Williamson --- lib/utils.pm | 6 +++--- tests/_graphical_wait_login.pm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index a520f954..b7d9e81a 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -7,7 +7,7 @@ use Exporter; use lockapi; use testapi; -our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout desktop_switch_layout console_loadkeys_us do_bootloader boot_decrypt check_release menu_launch_type repo_setup setup_workaround_repo cleanup_workaround_repo console_initial_setup gnome_initial_setup anaconda_create_user check_desktop download_modularity_tests quit_firefox advisory_get_installed_packages advisory_check_nonmatching_packages start_with_launcher quit_with_shortcut lo_dismiss_tip disable_firefox_studies select_rescue_mode copy_devcdrom_as_isofile bypass_1691487 get_release_number check_left_bar check_top_bar check_prerelease check_version spell_version_number _assert_and_click is_branched rec_log click_unwanted_notifications repos_mirrorlist register_application get_registered_applications solidify_wallpaper/; +our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout desktop_switch_layout console_loadkeys_us do_bootloader boot_decrypt check_release menu_launch_type repo_setup setup_workaround_repo cleanup_workaround_repo console_initial_setup handle_welcome_screen gnome_initial_setup anaconda_create_user check_desktop download_modularity_tests quit_firefox advisory_get_installed_packages advisory_check_nonmatching_packages start_with_launcher quit_with_shortcut lo_dismiss_tip disable_firefox_studies select_rescue_mode copy_devcdrom_as_isofile bypass_1691487 get_release_number check_left_bar check_top_bar check_prerelease check_version spell_version_number _assert_and_click is_branched rec_log click_unwanted_notifications repos_mirrorlist register_application get_registered_applications solidify_wallpaper/; # We introduce this global variable to hold the list of applications that have # registered during the apps_startstop_test when they have sucessfully run. @@ -659,7 +659,7 @@ sub console_initial_setup { type_string "c\n"; # continue } -sub _handle_welcome_screen { +sub handle_welcome_screen { # handle the 'welcome' screen on GNOME. shared in a few places if (check_screen "getting_started", 45) { send_key "alt-f4"; @@ -774,7 +774,7 @@ sub gnome_initial_setup { send_key "ret"; } else { - _handle_welcome_screen; + handle_welcome_screen; } # don't do it again on second load set_var("_setup_done", 1); diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm index aeca555e..24b771b0 100644 --- a/tests/_graphical_wait_login.pm +++ b/tests/_graphical_wait_login.pm @@ -87,7 +87,7 @@ sub run { } else { # ...from GNOME 40 on, we just get a "Welcome" tour - _handle_welcome_screen; + handle_welcome_screen; # protect against expecting it again set_var("_setup_done"); } @@ -96,7 +96,7 @@ sub run { if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { # handle welcome screen if we didn't do it above (holy flow # control, Batman!) - _handle_welcome_screen unless (get_var("_setup_done")); + handle_welcome_screen unless (get_var("_setup_done")); # if this was an image deployment, we also need to create # root user now, for subsequent tests to work if (get_var("IMAGE_DEPLOY")) {