Limit the license acceptance to only run on tests which run for ISO installations

It is unfortunately not that easy to limit this to ISOs due to that the misterous
limit to HDD_1 and not `custom_resize_lvm`
This commit is contained in:
lumarel 2021-11-10 17:20:47 +01:00
parent a8afc7b35b
commit d307716472

View File

@ -39,18 +39,20 @@ sub run {
# install, which transitions straight from g-i-s to logged-in # install, which transitions straight from g-i-s to logged-in
# desktop # desktop
unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
# for Rocky Linux here happens to be a license acceptance screen unless (get_var("HDD_1") && !(get_var("PARTITIONING") eq "custom_resize_lvm")) {
# the initial appearance can sometimes take really long # for Rocky Linux here happens to be a license acceptance screen
assert_screen "gdm_initial_setup_license", 120; # the initial appearance can sometimes take really long
assert_and_click "gdm_initial_setup_license"; assert_screen "gdm_initial_setup_license", 120;
# Make sure the card has fully lifted until clicking on the buttons assert_and_click "gdm_initial_setup_license";
wait_still_screen 5, 30; # Make sure the card has fully lifted until clicking on the buttons
assert_and_click "gdm_initial_setup_licence_accept"; wait_still_screen 5, 30;
assert_and_click "gdm_spoke_done"; assert_and_click "gdm_initial_setup_licence_accept";
# As well as coming back assert_and_click "gdm_spoke_done";
wait_still_screen 5, 30; # As well as coming back
assert_screen "gdm_initial_setup_license_accepted"; wait_still_screen 5, 30;
assert_and_click "gdm_initial_setup_spoke_forward"; assert_screen "gdm_initial_setup_license_accepted";
assert_and_click "gdm_initial_setup_spoke_forward";
}
boot_to_login_screen(timeout => $wait_time); boot_to_login_screen(timeout => $wait_time);
# if USER_LOGIN is set to string 'false', we're done here # if USER_LOGIN is set to string 'false', we're done here