Merge pull request os-autoinst#23825 from GraceWang571/poo188364

Remove check_screen(http-server-running) from x11test

Author: GraceWang571

lib/x11test.pm

@@ -715,9 +715,6 @@ sub exit_firefox_common {
         # confirm "save&quit"
         send_key "ret";
     }
-    if (check_screen("http-server-running", 5)) {
-        send_key "ctrl-c";
-    }
     # wait a sec because xterm-without-focus can match while firefox is being closed
     wait_still_screen 3, 6;
     assert_screen [qw(xterm-left-open xterm-without-focus)];

tests/x11/firefox/firefox_html5.pm

@@ -36,6 +36,7 @@ sub run {
         send_key 'alt-tab';    #Switch to firefox
     }
     $self->exit_firefox;
-    send_key_until_needlematch("generic-desktop", "alt-f4", 6, 5);
+    send_key_until_needlematch ["generic-desktop", "confirm-close-window"], "alt-f4", 6, 5;
+    send_key 'ret' if match_has_tag 'confirm-close-window';
 }
 1;