From 05c9f4fbcd95720c1cb5e8a2ebde2d6a5f7ce3c5 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 24 May 2018 14:17:24 -0700 Subject: [PATCH] Make sure all `check_screen` calls have explicit timeout Upstream is gonna change the default from 30 to 0, it seems: https://github.com/os-autoinst/os-autoinst/pull/965 so let's go ahead and change these two cases where we have no explicit timeout to have one. Signed-off-by: Adam Williamson --- lib/utils.pm | 2 +- tests/_graphical_wait_login.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index 184c6218..6b34a6f9 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -488,7 +488,7 @@ sub gnome_initial_setup { } else { # wait for the stupid 'help' screen to show and kill it - if (check_screen "getting_started") { + if (check_screen "getting_started", 30) { send_key "alt-f4"; wait_still_screen 5; } diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm index a7831b29..042600a9 100644 --- a/tests/_graphical_wait_login.pm +++ b/tests/_graphical_wait_login.pm @@ -93,7 +93,7 @@ sub run { } if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { # wait for the stupid 'help' screen to show and kill it - if (check_screen "getting_started") { + if (check_screen "getting_started", 30) { send_key "alt-f4"; wait_still_screen 5; }