Restore Chrome jobs to CI config in MV3

Author: lenacohen

.github/workflows/test.yml

@@ -46,6 +46,15 @@ jobs:
           - job: edge-beta
             BROWSER: "microsoft-edge-beta"
             BROWSER_VERSION: "beta"
+          - job: chrome
+            BROWSER: "google-chrome-stable"
+            BROWSER_VERSION: "stable"
+          - job: chrome-beta
+            BROWSER: "google-chrome-beta"
+            BROWSER_VERSION: "beta"
+          - job: chrome-dev
+            BROWSER: "google-chrome-dev"
+            BROWSER_VERSION: "dev"
     env:
       BROWSER: ${{ matrix.BROWSER }}
     name:
@@ -82,6 +91,21 @@ jobs:
         if: ${{ matrix.BROWSER == 'microsoft-edge-beta' }}
         run: ./scripts/edge_webdriver.sh
 
+      - name: Set up Chrome
+        if:  ${{ contains(matrix.BROWSER, 'chrome') }}
+        uses: browser-actions/setup-chrome@v1
+        with:
+          chrome-version: ${{ matrix.BROWSER_VERSION }}
+          install-chromedriver: true
+        id: setup-chrome
+
+      # fix ChromeDriver failure due to existing Chrome installation:
+      # "This version of ChromeDriver only supports Chrome version XX"
+      - name: Work around browser-actions/setup-chrome bug
+        if: ${{ contains(matrix.BROWSER, 'chrome') }}
+        run: |
+          sudo ln -s ${{ steps.setup-chrome.outputs.chrome-path }} /usr/local/bin/${{ matrix.BROWSER }}
+
       - name: Install Xvfb
         run: sudo apt-get install -y xvfb
 

tests/selenium/content_filtering_test.py

@@ -109,7 +109,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=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."""
@@ -362,6 +362,7 @@ def test_reenabling_dnt_policy_checking(self):
         self.load_url(self.FIXTURE_URL)
         self.assert_load()
 
+    @pytest.mark.flaky(reruns=3)
     def test_removing_dnt(self):
         self.block_domain(self.THIRD_PARTY_DOMAIN)
         self.set_dnt(self.THIRD_PARTY_DOMAIN)

tests/selenium/pbtest.py

@@ -37,6 +37,7 @@
 
 BROWSER_TYPES = ['chrome', 'firefox', 'edge']
 BROWSER_NAMES = ['google-chrome', 'google-chrome-stable', 'google-chrome-beta',
+                 'google-chrome-dev', 'google-chrome-unstable',
                  'firefox', 'microsoft-edge', 'microsoft-edge-beta']