From d3077164728aa74b894695b4a4adb9508401fbb9 Mon Sep 17 00:00:00 2001 From: lumarel Date: Wed, 10 Nov 2021 17:20:47 +0100 Subject: [PATCH] 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` --- tests/_graphical_wait_login.pm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm index 3d126f7b..ef45a8da 100644 --- a/tests/_graphical_wait_login.pm +++ b/tests/_graphical_wait_login.pm @@ -39,18 +39,20 @@ sub run { # install, which transitions straight from g-i-s to logged-in # desktop unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { - # for Rocky Linux here happens to be a license acceptance screen - # the initial appearance can sometimes take really long - assert_screen "gdm_initial_setup_license", 120; - assert_and_click "gdm_initial_setup_license"; - # Make sure the card has fully lifted until clicking on the buttons - wait_still_screen 5, 30; - assert_and_click "gdm_initial_setup_licence_accept"; - assert_and_click "gdm_spoke_done"; - # As well as coming back - wait_still_screen 5, 30; - assert_screen "gdm_initial_setup_license_accepted"; - assert_and_click "gdm_initial_setup_spoke_forward"; + unless (get_var("HDD_1") && !(get_var("PARTITIONING") eq "custom_resize_lvm")) { + # for Rocky Linux here happens to be a license acceptance screen + # the initial appearance can sometimes take really long + assert_screen "gdm_initial_setup_license", 120; + assert_and_click "gdm_initial_setup_license"; + # Make sure the card has fully lifted until clicking on the buttons + wait_still_screen 5, 30; + assert_and_click "gdm_initial_setup_licence_accept"; + assert_and_click "gdm_spoke_done"; + # As well as coming back + wait_still_screen 5, 30; + assert_screen "gdm_initial_setup_license_accepted"; + assert_and_click "gdm_initial_setup_spoke_forward"; + } boot_to_login_screen(timeout => $wait_time); # if USER_LOGIN is set to string 'false', we're done here