Fix check_desktop variable timeouts

I forgot that tries was configurable. Sigh. Convert it to a
timeout argument.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-04-18 14:54:48 -07:00
parent 3a0b6349e7
commit ea9ac508ac
3 changed files with 7 additions and 3 deletions

View File

@ -738,7 +738,11 @@ sub check_desktop {
# icon. But GNOME has gone back to the top bar being a solid color
# by default, so we don't have this problem any more and this is
# back to just being a simple needle match.
assert_screen "apps_menu_button", 30;
my %args = (
timeout => 30,
@_
);
assert_screen "apps_menu_button", $args{timeout};
}
sub download_modularity_tests {

View File

@ -91,7 +91,7 @@ sub run {
# Move the mouse somewhere it won't highlight the match areas
mouse_set(300, 800);
# KDE can take ages to start up
check_desktop(tries=>40);
check_desktop(timeout=>120);
}
sub test_flags {

View File

@ -67,7 +67,7 @@ sub run {
type_very_safely get_var("USER_PASSWORD", "weakpassword");
send_key 'ret';
}
check_desktop(tries=>30);
check_desktop(timeout=>90);
# now, WE WAIT. this is just an unconditional wait - rather than
# breaking if we see an update notification appear - so we catch
# things that crash a few minutes after startup, etc.