Firefox

lib/x11test.pm

@@ -580,8 +580,6 @@ sub start_clean_firefox {
     $self->firefox_open_url('opensuse.org');
     my $count = 10;
     while ($count--) {
-        # workaround for bsc#1046005
-        assert_and_click 'firefox_titlebar' if check_screen('firefox_titlebar', 2);
         if (check_screen 'firefox_trackinfo', 3) {
             record_info 'Tracking protection', 'Track info did show up';
             assert_and_click 'firefox_trackinfo';
@@ -613,8 +611,6 @@ sub start_clean_firefox {
         wait_still_screen(3);
         assert_and_click 'firefox_readerview_window';
     }
-    # workaround for bsc#1046005
-    assert_and_click 'firefox_titlebar' if check_screen('firefox_titlebar', 2);
 
     # Help
     send_key "alt-h";
@@ -696,25 +692,13 @@ sub firefox_check_popups {
         elsif (match_has_tag('firefox_readerview_window')) {
             wait_screen_change { assert_and_click 'firefox_readerview_window'; };
         }
-
-        if (match_has_tag('firefox_trackinfo') or match_has_tag('firefox_readerview_window')) {
-            # bsc#1046005 does not seem to affect KDE and as the workaround sometimes results in
-            # accidentially moving the firefox window around, skip it.
-            if (!check_var("DESKTOP", "kde")) {
-                # workaround for bsc#1046005
-                assert_and_click 'firefox_titlebar' if check_screen('firefox_titlebar', 2);
-            }
-        }
     }
 }
 
 sub firefox_open_url {
     my ($self, $url, %args) = @_;
     my $counter = 1;
     while (1) {
-        # make sure firefox window is focused
-        assert_and_click 'firefox_titlebar' if check_screen('firefox_titlebar', 2);
-        wait_still_screen 1, 2;
         send_key 'alt-d';
         send_key 'delete';
         send_key 'alt-d';

tests/x11/firefox/firefox_html5.pm

@@ -27,6 +27,7 @@ sub run {
     enter_cmd('python3 -m http.server 48080 &');
     # curl provides an adequate time window for the server to run
     assert_script_run 'curl --connect-timeout 5 --max-time 10 --retry-connrefused 5 --retry-delay 1 --retry-max-time 40 http://localhost:48080/';
+    send_key 'alt-tab';    #Switch to firefox
     $self->firefox_open_url('http://localhost:48080/html5_video', assert_loaded_url => 'firefox-testvideo');
     $self->exit_firefox;
     enter_cmd('exit');