From 855aaef258d31224fe21af0090a582c7f6338b07 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 5 Aug 2020 13:56:07 -0700 Subject: [PATCH] Try harder to be safe when quitting Firefox Signed-off-by: Adam Williamson --- tests/freeipa_password_change.pm | 3 ++- tests/freeipa_webui.pm | 5 +++-- tests/realmd_join_cockpit.pm | 5 +++-- tests/server_cockpit_default.pm | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/freeipa_password_change.pm b/tests/freeipa_password_change.pm index bfae9b57..49491f75 100644 --- a/tests/freeipa_password_change.pm +++ b/tests/freeipa_password_change.pm @@ -38,8 +38,9 @@ sub run { # close browser, back to console quit_firefox; # we don't get back to a prompt instantly and keystrokes while X - # is still shutting down are swallowed, so wait_still_screen before + # is still shutting down are swallowed, so be careful before # finishing (and handing off to freeipa_client_postinstall) + assert_screen "root_console"; wait_still_screen 5; # check we can kinit with changed password assert_script_run 'printf "loremipsum" | kinit test3'; diff --git a/tests/freeipa_webui.pm b/tests/freeipa_webui.pm index 4e225423..981b446e 100644 --- a/tests/freeipa_webui.pm +++ b/tests/freeipa_webui.pm @@ -43,8 +43,9 @@ sub run { # quit browser to return to console quit_firefox; # we don't get back to a prompt instantly and keystrokes while X - # is still shutting down are swallowed, so wait_still_screen before - # finishing (and handing off to freeipa_client_postinstall) + # is still shutting down are swallowed, so be careful before + # finishing (and handing off to next test) + assert_screen "root_console"; wait_still_screen 5; # set permanent passwords for both accounts assert_script_run 'printf "correcthorse\nbatterystaple\nbatterystaple" | kinit test3@DOMAIN.LOCAL'; diff --git a/tests/realmd_join_cockpit.pm b/tests/realmd_join_cockpit.pm index 8888f622..0f1a50da 100644 --- a/tests/realmd_join_cockpit.pm +++ b/tests/realmd_join_cockpit.pm @@ -55,8 +55,9 @@ sub run { # quit browser to return to console quit_firefox; # we don't get back to a prompt instantly and keystrokes while X - # is still shutting down are swallowed, so wait_still_screen before - # finishing (and handing off to freeipa_client_postinstall) + # is still shutting down are swallowed, so be careful before + # finishing (and handing off to next test) + assert_screen "root_console"; wait_still_screen 5; } diff --git a/tests/server_cockpit_default.pm b/tests/server_cockpit_default.pm index c7c53f43..60fcc023 100644 --- a/tests/server_cockpit_default.pm +++ b/tests/server_cockpit_default.pm @@ -15,8 +15,9 @@ sub run { # quit firefox (return to console) quit_firefox; # we don't get back to a prompt instantly and keystrokes while X - # is still shutting down are swallowed, so wait_still_screen before + # is still shutting down are swallowed, so be careful before # finishing (and handing off to next test) + assert_screen "root_console"; wait_still_screen 5; }