From 87456f6b1d88f3630385addbb2a694268b1a96c3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 27 May 2019 14:28:17 -0700 Subject: [PATCH] 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 --- lib/utils.pm | 2 +- tests/_boot_to_anaconda.pm | 4 ++-- tests/desktop_update_graphical.pm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index a315dcbf..fee61559 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -570,7 +570,7 @@ sub anaconda_create_user { @_ ); 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"; # wait out animation wait_still_screen 2; diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index cc62c3d3..cf3d8425 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -56,12 +56,12 @@ sub run { } else { # on lives, we have to explicitly launch anaconda 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'; # wait for anaconda to appear; we click to work around # 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 wait_screen_change { assert_and_click "anaconda_select_install_lang_input"; }; type_safely $language; diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm index 8f9ed2dd..ae7d12f9 100644 --- a/tests/desktop_update_graphical.pm +++ b/tests/desktop_update_graphical.pm @@ -57,7 +57,7 @@ sub run { # 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) { # 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 # minutes to avoid the idle screen blank kicking in. Depending on