Try harder to be safe when quitting Firefox

Signed-off-by: Adam Williamson <awilliam@redhat.com>

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';

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';

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;
 }
 

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;
 }