Use new arg style for assert_and_click

In the new os-autoinst I just sent to staging, the old style
doesn't work any more, breaks all tests. This style should also
work with the older os-autoinst on stable.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-05-27 14:28:17 -07:00
parent a8bcc191bb
commit 87456f6b1d
3 changed files with 4 additions and 4 deletions

View File

@ -570,7 +570,7 @@ sub anaconda_create_user {
@_ @_
); );
my $user_login = get_var("USER_LOGIN") || "test"; my $user_login = get_var("USER_LOGIN") || "test";
assert_and_click "anaconda_install_user_creation", '', $args{timeout}; assert_and_click("anaconda_install_user_creation", timeout=>$args{timeout});
assert_screen "anaconda_install_user_creation_screen"; assert_screen "anaconda_install_user_creation_screen";
# wait out animation # wait out animation
wait_still_screen 2; wait_still_screen 2;

View File

@ -56,12 +56,12 @@ sub run {
} else { } else {
# on lives, we have to explicitly launch anaconda # on lives, we have to explicitly launch anaconda
if (get_var('LIVE')) { if (get_var('LIVE')) {
assert_and_click "live_start_anaconda_icon", '', 300; assert_and_click("live_start_anaconda_icon", timeout=>300);
} }
my $language = get_var('LANGUAGE') || 'english'; my $language = get_var('LANGUAGE') || 'english';
# wait for anaconda to appear; we click to work around # wait for anaconda to appear; we click to work around
# RHBZ #1566066 if it happens # RHBZ #1566066 if it happens
assert_and_click "anaconda_select_install_lang", '', 300; assert_and_click("anaconda_select_install_lang", timeout=>300);
# Select install language # Select install language
wait_screen_change { assert_and_click "anaconda_select_install_lang_input"; }; wait_screen_change { assert_and_click "anaconda_select_install_lang_input"; };
type_safely $language; type_safely $language;

View File

@ -57,7 +57,7 @@ sub run {
# already be visible at this point, we may not need to refresh # already be visible at this point, we may not need to refresh
unless (check_screen ['desktop_package_tool_update_apply', 'desktop_package_tool_update_download'], 5) { unless (check_screen ['desktop_package_tool_update_apply', 'desktop_package_tool_update_download'], 5) {
# refresh updates # refresh updates
assert_and_click 'desktop_package_tool_update_refresh', '', 120; assert_and_click('desktop_package_tool_update_refresh', timeout=>120);
} }
# wait for refresh, then apply updates, moving the mouse every two # wait for refresh, then apply updates, moving the mouse every two
# minutes to avoid the idle screen blank kicking in. Depending on # minutes to avoid the idle screen blank kicking in. Depending on