Bug 1988681 - [wdspec] avoid race conditions with requests blocked in responseStarted phase r=webdriver-reviewers,whimboo

Differential Revision: https://phabricator.services.mozilla.com/D264909

Author: juliandescottes

testing/web-platform/meta/webdriver/tests/bidi/network/add_intercept/__dir__.ini

@@ -1,4 +1,5 @@
 import asyncio
+import random
 import uuid
 
 import pytest
@@ -33,7 +34,7 @@ async def test_other_url(
     )
 
     # Add an intercept.
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     await add_intercept(
         phases=[phase],
         url_patterns=[{"type": "string", "pattern": text_url}],
@@ -75,7 +76,7 @@ async def test_two_intercepts(
     )
 
     # Add a string intercept to catch requests to PAGE_EMPTY_TEXT.
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     string_intercept = await add_intercept(
         phases=["beforeRequestSent"],
         url_patterns=[{"type": "string", "pattern": text_url}],
@@ -96,7 +97,7 @@ async def test_two_intercepts(
     )
 
     # Perform a request to PAGE_OTHER_TEXT, which should only match one intercept
-    other_url = url(PAGE_OTHER_TEXT)
+    other_url = f"{url(PAGE_OTHER_TEXT)}?nocache={random.random()}"
 
     on_network_event = wait_for_event(BEFORE_REQUEST_SENT_EVENT)
     asyncio.ensure_future(fetch(other_url))

testing/web-platform/meta/webdriver/tests/bidi/network/add_intercept/add_intercept.py.ini

@@ -1,4 +1,5 @@
 import asyncio
+import random
 
 import pytest
 from webdriver.bidi.modules.script import ScriptEvaluateResultException
@@ -52,7 +53,7 @@ async def test_frame_context(
     frame = contexts[0]["children"][0]
 
     # Add an intercept.
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     await add_intercept(
         phases=[phase],
         url_patterns=[{"type": "string", "pattern": text_url}],
@@ -97,13 +98,20 @@ async def test_other_context(
     )
 
     # Add an intercept.
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
+
+    # Note: generate two distinct URLs matching the pattern to avoid cases
+    # where the blocked response of the first request is reused for the second
+    # request on Firefox (https://bugzilla.mozilla.org/show_bug.cgi?id=1966494).
+    text_url_other = f"{url(PAGE_EMPTY_TEXT)}?othercontext&nocache={random.random()}"
+
     await add_intercept(
         phases=[phase],
-        url_patterns=[{"type": "string", "pattern": text_url}],
+        # Use a pattern url_pattern to match both URLs using different search
+        # parameters.
+        url_patterns=[{"type": "pattern", "pathname": PAGE_EMPTY_TEXT}],
     )
 
-
     # Request to new_tab should be blocked.
     [event_name, assert_network_event] = PHASE_TO_EVENT_MAP[phase]
     on_network_event = wait_for_event(event_name)
@@ -113,7 +121,7 @@ async def test_other_context(
 
     # Request to other_context should not be blocked because we are not
     # subscribed to network events. Wait for fetch to resolve successfully.
-    await asyncio.ensure_future(fetch(text_url, context=other_context))
+    await asyncio.ensure_future(fetch(text_url_other, context=other_context))
 
 
 @pytest.mark.asyncio
@@ -144,7 +152,7 @@ async def test_other_context_with_event_subscription(
     )
 
     # Add an intercept to new_tab only.
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     await add_intercept(
         phases=["beforeRequestSent"],
         url_patterns=[{"type": "string", "pattern": text_url}],
@@ -193,7 +201,7 @@ async def test_two_contexts_same_intercept(
     )
 
     # Add an intercept to both contexts
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     intercept = await add_intercept(
         phases=["beforeRequestSent"],
         url_patterns=[{"type": "string", "pattern": text_url}],
@@ -242,7 +250,7 @@ async def test_two_contexts_global_intercept(
     )
 
     # Add an intercept for new_tab and a global intercept.
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     context_intercept = await add_intercept(
         phases=["beforeRequestSent"],
         url_patterns=[{"type": "string", "pattern": text_url}],

testing/web-platform/meta/webdriver/tests/bidi/network/add_intercept/contexts.py.ini

@@ -1,4 +1,5 @@
 import pytest
+import random
 
 import asyncio
 
@@ -44,7 +45,7 @@ async def test_basic_authentication(
     auth_required_events = network_events[AUTH_REQUIRED_EVENT]
     response_completed_events = network_events[RESPONSE_COMPLETED_EVENT]
 
-    auth_url = url("/webdriver/tests/support/http_handlers/authentication.py")
+    auth_url = url(f"/webdriver/tests/support/http_handlers/authentication.py?nocache={random.random()}")
     intercept = await add_intercept(
         phases=["authRequired"],
         url_patterns=[{"type": "string", "pattern": auth_url}],
@@ -105,7 +106,7 @@ async def test_no_authentication(
     auth_required_events = network_events[AUTH_REQUIRED_EVENT]
     response_completed_events = network_events[RESPONSE_COMPLETED_EVENT]
 
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     intercept = await add_intercept(
         phases=["authRequired"],
         url_patterns=[{"type": "string", "pattern": text_url}],

testing/web-platform/meta/webdriver/tests/bidi/network/add_intercept/phases.py.ini

@@ -1,4 +1,5 @@
 import pytest
+import random
 from webdriver.bidi.modules.script import ScriptEvaluateResultException
 
 from .. import (
@@ -43,7 +44,7 @@ async def test_request_response_phases(
     response_started_events = network_events[RESPONSE_STARTED_EVENT]
     response_completed_events = network_events[RESPONSE_COMPLETED_EVENT]
 
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     intercept = await add_intercept(
         phases=phases,
         url_patterns=[{"type": "string", "pattern": text_url}],
@@ -111,7 +112,7 @@ async def test_not_listening_to_phase_event(
     await setup_network_test(events=events)
 
     # Add an intercept without listening to the corresponding network event
-    text_url = url(PAGE_EMPTY_TEXT)
+    text_url = f"{url(PAGE_EMPTY_TEXT)}?nocache={random.random()}"
     await add_intercept(
         phases=[phase],
         url_patterns=[{"type": "string", "pattern": text_url}],