ci: do not run mapper tests on macos (#3303)

Author: sadym-chromium

.github/workflows/e2e.yml

@@ -45,20 +45,26 @@ jobs:
       matrix:
         # TODO(#876): Add Windows CI.
         # TODO(#2154): Use macos-latest once Python setup supports mac arm64.
-        # TODO(#3294): Enable headful chromedriver on ubuntu.
         os: [ubuntu-latest, macos-13]
         head: [headful, 'new-headless', 'old-headless']
-        kind: [chromedriver, mapper]
+        # `cd` runs e2e via `chromedriver`. `node` runs tests using `NodeJS` runner.
+        kind: [cd, node]
         total_chunks: [4]
         this_chunk: [0, 1, 2, 3]
         exclude:
+          # Run e2e via NodeJS only in new headless ubuntu.
           - os: macos-13
-            head: new-headless
-          - os: macos-13
+            kind: node
+          - os: ubuntu-latest
+            kind: node
+            head: headful
+          - os: ubuntu-latest
+            kind: node
             head: old-headless
+          # TODO(#3294): Enable headful chromedriver on ubuntu.
           - os: ubuntu-latest
             head: headful
-            kind: chromedriver
+            kind: cd
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -98,7 +104,7 @@ jobs:
           --total-chunks=${{ matrix.total_chunks }}
         env:
           VERBOSE: ${{ github.event.inputs.verbose }}
-          CHROMEDRIVER: ${{ matrix.kind == 'chromedriver' }}
+          CHROMEDRIVER: ${{ matrix.kind == 'cd' }}
       - name: Run E2E tests
         if: matrix.os != 'ubuntu-latest' || matrix.head != 'headful'
         timeout-minutes: 20
@@ -109,7 +115,7 @@ jobs:
           --total-chunks=${{ matrix.total_chunks }}
         env:
           VERBOSE: ${{ github.event.inputs.verbose }}
-          CHROMEDRIVER: ${{ matrix.kind == 'chromedriver' }}
+          CHROMEDRIVER: ${{ matrix.kind == 'cd' }}
       - name: Upload artifacts
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/wpt.yml

@@ -64,13 +64,13 @@ jobs:
       fail-fast: false
       matrix:
         # Should be in sync with `update_expectations` job.
-        kind: [chromedriver, mapper]
+        kind: [cd, node]
         head: [headless, headful]
         total_chunks: [6]
         this_chunk: [1, 2, 3, 4, 5, 6]
         exclude:
-          # Don't run headful mapper, as it takes too long.
-          - kind: mapper
+          # Don't run headful node, as it takes too long.
+          - kind: node
             head: headful
     steps:
       - name: Checkout
@@ -108,20 +108,20 @@ jobs:
           xvfb-run --auto-servernum
           npm run wpt -- "webdriver/tests/bidi/${{ github.event.inputs.tests }}"
         env:
-          CHROMEDRIVER: ${{ matrix.kind == 'chromedriver' }}
+          CHROMEDRIVER: ${{ matrix.kind == 'cd' }}
           HEADLESS: ${{ matrix.head!='headful' }}
           THIS_CHUNK: ${{ matrix.this_chunk }}
           TOTAL_CHUNKS: ${{ matrix.total_chunks }}
           UPDATE_EXPECTATIONS: false
           VERBOSE: ${{ github.event.inputs.verbose }}
           WPT_REPORT: out/wptreport.${{ matrix.kind }}-${{ matrix.head }}-${{ matrix.this_chunk }}.${{ matrix.total_chunks }}.json
       - name: Run WPT interop tests
-        if: ${{matrix.kind == 'chromedriver'}}
+        if: ${{matrix.kind == 'cd'}}
         run: >
           xvfb-run --auto-servernum
           npm run wpt -- "webdriver/tests/interop/${{ github.event.inputs.tests }}"
         env:
-          CHROMEDRIVER: ${{ matrix.kind == 'chromedriver' }}
+          CHROMEDRIVER: ${{ matrix.kind == 'cd' }}
           CHROMEDRIVER_LOG_NAME: 'chromedriver-interop'
           THIS_CHUNK: ${{ matrix.this_chunk }}
           TOTAL_CHUNKS: ${{ matrix.total_chunks }}
@@ -145,11 +145,11 @@ jobs:
     strategy:
       matrix:
         # Should be in sync with `wpt` job.
-        kind: [chromedriver, mapper]
+        kind: [cd, node]
         head: [headless, headful]
         exclude:
-          # Don't run headful mapper, as it takes too long.
-          - kind: mapper
+          # Don't run headful node, as it takes too long.
+          - kind: node
             head: headful
     runs-on: ubuntu-latest
     needs: [wpt-required]
@@ -189,7 +189,7 @@ jobs:
       - name: Update expectations
         timeout-minutes: 60
         env:
-          CHROMEDRIVER: ${{ matrix.kind == 'chromedriver' }}
+          CHROMEDRIVER: ${{ matrix.kind == 'cd' }}
           HEADLESS: ${{ matrix.head!='headful' }}
           # Do not run tests, only update expectations.
           RUN_TESTS: false
@@ -202,9 +202,9 @@ jobs:
           -name "wptreport.${{ matrix.kind }}-${{ matrix.head }}*.json"
           -exec npm run wpt -- --wpt-report {} \;
       - name: Update interop expectations
-        if: ${{ matrix.kind == 'chromedriver' }}
+        if: ${{ matrix.kind == 'cd' }}
         env:
-          CHROMEDRIVER: ${{ matrix.kind == 'chromedriver' }}
+          CHROMEDRIVER: ${{ matrix.kind == 'cd' }}
           HEADLESS: ${{ matrix.head!='headful' }}
           # Do not run tests, only update expectations.
           RUN_TESTS: false

tests/network/test_network.py

@@ -31,7 +31,7 @@ async def test_network_before_request_sent_event_emitted(
         websocket, context_id, url_base):
     await subscribe(websocket, ["network.beforeRequestSent"], [context_id])
 
-    command_id = await send_JSON_command(
+    await send_JSON_command(
         websocket, {
             "method": "browsingContext.navigate",
             "params": {
@@ -41,7 +41,7 @@ async def test_network_before_request_sent_event_emitted(
             }
         })
 
-    resp = await read_JSON_message(websocket)
+    resp = await wait_for_event(websocket, "network.beforeRequestSent")
 
     assert resp == AnyExtending({
         'type': 'event',
@@ -69,17 +69,6 @@ async def test_network_before_request_sent_event_emitted(
             "timestamp": ANY_TIMESTAMP
         }
     })
-    navigation_id = resp["params"]["navigation"]
-
-    resp = await read_JSON_message(websocket)
-    # Assert the navigation from the event is the same as in the command result.
-    assert resp == AnyExtending({
-        'id': command_id,
-        'result': {
-            'navigation': navigation_id
-        },
-        'type': 'success'
-    })
 
 
 @pytest.mark.asyncio
@@ -248,7 +237,7 @@ async def test_network_response_completed_event_emitted(
             }
         })
 
-    resp = await read_JSON_message(websocket)
+    resp = await wait_for_event(websocket, "network.responseCompleted")
     headersSize = compute_response_headers_size(
         resp["params"]["response"]["headers"])