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,6 +39,7 @@ 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")) {
unless (get_var("HDD_1") && !(get_var("PARTITIONING") eq "custom_resize_lvm")) {
# for Rocky Linux here happens to be a license acceptance screen # for Rocky Linux here happens to be a license acceptance screen
# the initial appearance can sometimes take really long # the initial appearance can sometimes take really long
assert_screen "gdm_initial_setup_license", 120; assert_screen "gdm_initial_setup_license", 120;
@ -51,6 +52,7 @@ sub run {
wait_still_screen 5, 30; wait_still_screen 5, 30;
assert_screen "gdm_initial_setup_license_accepted"; assert_screen "gdm_initial_setup_license_accepted";
assert_and_click "gdm_initial_setup_spoke_forward"; 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