Remove sleep statements and test failure debug attempts

Author: lenacohen

.github/workflows/test.yml

@@ -27,6 +27,7 @@ jobs:
             echo "Linting errors"
             exit 1
           fi
+  
   test:
     runs-on: ubuntu-22.04
     continue-on-error: true

tests/selenium/content_filtering_test.py

@@ -6,8 +6,6 @@
 
 import pbtest
 
-import time
-
 class ContentFilteringTest(pbtest.PBSeleniumTest):
     """Content filtering tests."""
 
@@ -53,17 +51,14 @@ def test_blocking(self):
         self.assert_block()
 
     # TODO sporadic "Cookie fixture should have set a cookie" failures
-    @pytest.mark.flaky(reruns=7)
+    @pytest.mark.flaky(reruns=5)
     def test_cookieblocking_stops_saving(self):
         self.load_url(f"https://{self.COOKIE_DOMAIN}/")
-        time.sleep(1)
         assert not self.driver.get_cookies(), (
             "Visiting the domain directly does not set a cookie")
 
         self.load_url(self.COOKIE_FIXTURE_URL)
-        time.sleep(1)
         self.load_url(f"https://{self.COOKIE_DOMAIN}/")
-        time.sleep(1)
         assert len(self.driver.get_cookies()) == 1, (
             "Cookie fixture should have set a cookie")
 
@@ -79,14 +74,12 @@ def test_cookieblocking_stops_saving(self):
     @pytest.mark.flaky(reruns=7)
     def test_cookieblocking_stops_sending(self):
         self.load_url(self.COOKIE_FIXTURE_URL)
-        time.sleep(1)
         self.wait_for_and_switch_to_frame("iframe[src]", timeout=1)
         self.wait_for_any_text('body')
         assert self.find_el_by_css('body').text == "cookies=0", (
             "No cookies should've been sent to start with")
 
         self.load_url(self.COOKIE_FIXTURE_URL)
-        time.sleep(1)
         self.wait_for_and_switch_to_frame("iframe[src]", timeout=1)
         self.wait_for_any_text('body')
         assert self.find_el_by_css('body').text == "cookies=1", (
@@ -95,7 +88,6 @@ def test_cookieblocking_stops_sending(self):
         self.cookieblock_domain(self.COOKIE_DOMAIN)
 
         self.load_url(self.COOKIE_FIXTURE_URL)
-        time.sleep(1)
         self.wait_for_and_switch_to_frame("iframe[src]", timeout=1)
         self.wait_for_any_text('body')
         assert self.find_el_by_css('body').text == "cookies=0", (
@@ -116,8 +108,7 @@ 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=7)
+    @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."""
@@ -138,12 +129,6 @@ def get_visitor_id():
         self.assert_load()
         visitor_id = get_visitor_id()
 
-        self.load_url(self.FIXTURE_URL + '?fingerprintjs')
-        self.assert_load()
-        visitor_id_2 = get_visitor_id()
-
-        print(f"=== Visitor ID 1: {visitor_id}, Visitor ID 2: {visitor_id_2} ====")
-
         # enable local learning
         self.load_url(self.options_url)
         self.wait_for_script("return window.OPTIONS_INITIALIZED")
@@ -376,7 +361,7 @@ def test_reenabling_dnt_policy_checking(self):
         self.load_url(self.FIXTURE_URL)
         self.assert_load()
 
-    @pytest.mark.flaky(reruns=5)
+    @pytest.mark.flaky(reruns=3)
     def test_removing_dnt(self):
         self.block_domain(self.THIRD_PARTY_DOMAIN)
         self.set_dnt(self.THIRD_PARTY_DOMAIN)
@@ -387,18 +372,16 @@ def test_removing_dnt(self):
         assert not self.check_dnt(self.THIRD_PARTY_DOMAIN), (
             "domain should not be DNT-compliant")
 
-        # DEBUGGING TEST FAILURES
         # poll for DNR to get updated
-        # self.wait_for_script(
-        #     "let done = arguments[arguments.length - 1];"
-        #     "(async function () {"
-        #     "  let { default: constants } = await import('../js/constants.js');"
-        #     "  let rules = await chrome.declarativeNetRequest.getDynamicRules();"
-        #     "  done(!rules.some(r => {"
-        #     "    return (r.action.type == 'allow' && r.priority == constants.DNR_DNT_ALLOW);"
-        #     "  }));"
-        #     "}());", execute_async=True)
-        time.sleep(2.5)
+        self.wait_for_script(
+            "let done = arguments[arguments.length - 1];"
+            "(async function () {"
+            "  let { default: constants } = await import('../js/constants.js');"
+            "  let rules = await chrome.declarativeNetRequest.getDynamicRules();"
+            "  done(!rules.some(r => {"
+            "    return (r.action.type == 'allow' && r.priority == constants.DNR_DNT_ALLOW);"
+            "  }));"
+            "}());", execute_async=True)
 
         self.load_url(self.FIXTURE_URL)
         self.assert_block()

tests/selenium/dnt_test.py

@@ -2,7 +2,6 @@
 
 import json
 import unittest
-import time
 
 import pytest
 
@@ -183,7 +182,6 @@ def test_should_not_record_nontracking_domains(self):
         except NoSuchElementException:
             self.fail("Unable to find the non-tracking domain on the page")
 
-        time.sleep(2)
         action_map = self.get_badger_storage('action_map')
 
         # verify that the cookie-tracking domain was recorded

tests/selenium/options_test.py

@@ -123,7 +123,6 @@ def test_removing_domain(self):
             domains = []
         assert len(domains) == 0, "No domains should be displayed after removal"
 
-    @pytest.mark.flaky(reruns=3)
     def test_reset_data(self):
         self.load_options_page()
         self.select_domain_list_tab()
@@ -135,8 +134,6 @@ def test_reset_data(self):
 
         # get the number of trackers in the seed data
         default_summary_text = self.driver.find_element(By.ID, "options_domain_list_trackers").text
-        print("=========== default_summary_text: ===========")
-        print(default_summary_text)
 
         # Click on the "remove all data" button to empty the tracker lists, and
         # click "OK" in the popup that ensues

tests/selenium/pbtest.py

@@ -147,7 +147,6 @@ def fix_chrome_extension_id(self):
     def wants_xvfb(self):
         if self.on_github_actions or bool(int(os.environ.get('ENABLE_XVFB', 0))):
             try:
-                print("========== wants_xvfb property set to true ==========")
                 Xvfb
             except NameError:
                 print("\nHeadless mode not supported: install xvfbwrapper first")
@@ -165,7 +164,6 @@ def on_github_actions(self):
     def chrome_manager(self):
         opts = ChromeOptions()
         opts.add_argument("--load-extension=" + self.extension_path)
-        # opts.add_argument("--headless")
         opts.binary_location = self.browser_path
 
         # work around https://issues.chromium.org/issues/409441960
@@ -193,7 +191,6 @@ def chrome_manager(self):
     @contextmanager
     def edge_manager(self):
         opts = EdgeOptions()
-        # opts.add_argument("--headless")
         opts.add_argument("--load-extension=" + self.extension_path)
         opts.binary_location = self.browser_path
 
@@ -217,7 +214,7 @@ def firefox_manager(self):
         for i in range(5):
             try:
                 opts = FirefoxOptions()
-                # opts.add_argument("--headless")
+
                 opts.binary_location = self.browser_path
 
                 # make extension ID constant across runs

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, max_tries=4)
+        self.switch_to_window_with_url(self.first_run_url)
 
     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, max_tries=4)
+        self.switch_to_window_with_url(self.options_url)
 
     def test_trackers_link(self):
         """Ensure trackers link opens EFF website."""