diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index e481eb26..4196f977 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -137,6 +137,17 @@ sub run { my $relnum = get_release_number; my $dclick = 0; $dclick = 1 if (get_var("DESKTOP") eq "kde"); + # WORKAROUND: New Anaconda does not start automatically, + # so we need to work around this by installing a package + # to trigger it. + menu_launch_type("terminal"); + wait_still_screen(2); + enter_cmd("sudo dnf install -y anaconda-webui"); + sleep(30); + enter_cmd("exit"); + wait_still_screen(2); + + # Start Anaconda by clicking on the launcher icon. assert_and_click("live_start_anaconda_icon", dclick => $dclick); unless (check_screen "anaconda_select_install_lang", 180) { # click it again - on KDE since 2019-10 or so it seems @@ -144,26 +155,31 @@ sub run { assert_and_click("live_start_anaconda_icon", dclick => $dclick, timeout => 300); } } - my $language = get_var('LANGUAGE') || 'english'; - # wait for anaconda to appear; we click to work around - # RHBZ #1566066 if it happens - assert_and_click("anaconda_select_install_lang", timeout => 300); + # Run the language selection only if not on Workstation, + # because Workstation does not provide language selection + # with new Anaconda yet. + unless (get_var("SUBVARIANT" eq "Workstation")) { + my $language = get_var('LANGUAGE') || 'english'; + # wait for anaconda to appear; we click to work around + # RHBZ #1566066 if it happens + assert_and_click("anaconda_select_install_lang", timeout => 300); - # Select install language - wait_screen_change { assert_and_click "anaconda_select_install_lang_input"; }; - type_safely $language; - # Needle filtering in main.pm ensures we will only look for the - # appropriate language, here - assert_and_click "anaconda_select_install_lang_filtered"; - assert_screen "anaconda_select_install_lang_selected", 10; - # Check for Help on the Language selection pane, if HELPCHECK is - # required - if (get_var('HELPCHECK')) { - check_help_on_pane("language_selection"); + # Select install language + wait_screen_change { assert_and_click "anaconda_select_install_lang_input"; }; + type_safely $language; + # Needle filtering in main.pm ensures we will only look for the + # appropriate language, here + assert_and_click "anaconda_select_install_lang_filtered"; + assert_screen "anaconda_select_install_lang_selected", 10; + # Check for Help on the Language selection pane, if HELPCHECK is + # required + if (get_var('HELPCHECK')) { + check_help_on_pane("language_selection"); + } + + assert_and_click "anaconda_select_install_lang_continue"; } - assert_and_click "anaconda_select_install_lang_continue"; - # wait 180 secs for hub or Rawhide warning dialog to appear # (per https://bugzilla.redhat.com/show_bug.cgi?id=1666112 # the nag screen can take a LONG time to appear sometimes).