Add more retries to failing tests

Author: lenacohen

tests/selenium/content_filtering_test.py

@@ -52,7 +52,7 @@ def test_blocking(self):
         self.assert_block()
 
     # TODO sporadic "Cookie fixture should have set a cookie" failures
-    @pytest.mark.flaky(reruns=3)
+    @pytest.mark.flaky(reruns=5)
     def test_cookieblocking_stops_saving(self):
         self.load_url(f"https://{self.COOKIE_DOMAIN}/")
         assert not self.driver.get_cookies(), (
@@ -72,7 +72,7 @@ def test_cookieblocking_stops_saving(self):
             "Cookie fixture should have been blocked from setting a cookie")
 
     # TODO sporadic "We should have sent a cookie at this point" failures
-    @pytest.mark.flaky(reruns=3)
+    @pytest.mark.flaky(reruns=5)
     def test_cookieblocking_stops_sending(self):
         self.load_url(self.COOKIE_FIXTURE_URL)
         self.wait_for_and_switch_to_frame("iframe[src]", timeout=1)
@@ -109,7 +109,8 @@ def test_cookieblocking_base_overwrites_subdomain_block(self):
         self.load_url(self.FIXTURE_URL + '?alt3p')
         self.assert_load()
 
-    @pytest.mark.flaky(reruns=3, condition=pbtest.shim.browser_type == "edge")
+    # @pytest.mark.flaky(reruns=3, condition=pbtest.shim.browser_type == "edge")
+    @pytest.mark.flaky(reruns=5)
     def test_blocking_fp_script_served_from_cookieblocked_cdn(self):
         """Since we have a surrogate script for FingerprintJS served from
         cdn.jsdelivr.net, we need to test surrogation rather than blocking."""
@@ -361,7 +362,8 @@ def test_reenabling_dnt_policy_checking(self):
 
         self.load_url(self.FIXTURE_URL)
         self.assert_load()
-
+    
+    @pytest.mark.flaky(reruns=5)
     def test_removing_dnt(self):
         self.block_domain(self.THIRD_PARTY_DOMAIN)
         self.set_dnt(self.THIRD_PARTY_DOMAIN)

tests/selenium/dnt_test.py

@@ -148,7 +148,7 @@ def test_dnt_policy_check_should_not_send_cookies(self):
         result = self.check_dnt(TEST_DOMAIN)
         assert result, "One or more cookies were sent (cookies=0 policy hash did not match)"
 
-    @pytest.mark.flaky(reruns=3, condition=pbtest.shim.browser_type in ("chrome", "edge"))
+    @pytest.mark.flaky(reruns=5, condition=pbtest.shim.browser_type in ("chrome", "edge"))
     def test_should_not_record_nontracking_domains(self):
         NONTRACKING_FIXTURE_URL = (
             "https://efforg.github.io/privacybadger-test-fixtures/html/"

tests/selenium/popup_test.py

@@ -44,7 +44,7 @@ def test_welcome_page_reminder_overlay(self):
         self.driver.find_element(By.ID, "intro-reminder-btn").click()
 
         # switch to the welcome page or fail
-        self.switch_to_window_with_url(self.first_run_url)
+        self.switch_to_window_with_url(self.first_run_url, max_tries=4)
 
     def test_help_button(self):
         """Ensure FAQ website is opened when help button is clicked."""
@@ -76,7 +76,7 @@ def test_options_button(self):
             pass
         self.open_popup()
         self.driver.find_element(By.ID, "options").click()
-        self.switch_to_window_with_url(self.options_url)
+        self.switch_to_window_with_url(self.options_url, max_tries=4)
 
     def test_trackers_link(self):
         """Ensure trackers link opens EFF website."""