remove unnecessary tests and methods

Author: srwei

infrastructure/testdriver/bidi/speculation/prefetch_status_updated.https.html

@@ -19,17 +19,11 @@
         const receivedEvents = [];
         const expectedEvents = ['pending', 'ready'];
 
-        // Create target url with unique id to ensure events are from this test
-        const uuid = self.crypto.randomUUID();
-        const targetUrl = window.location.origin + "/infrastructure/testdriver/bidi/speculation/resources/target.html?" + uuid;
+        const targetUrl = window.location.origin + "/infrastructure/testdriver/bidi/speculation/resources/target.html";
 
         // Create a promise that resolves when we receive the 'ready' event
         const readyEventPromise = new Promise((resolve, reject) => {
             const removeHandler = test_driver.bidi.speculation.prefetch_status_updated.on((event) => {
-                // Ignore events from other tests that could be running in parallel.
-                if (event.url !== targetUrl) {
-                    return;
-                }
                 receivedEvents.push(event);
 
                 // When we receive the ready event, clean up and resolve
@@ -41,7 +35,6 @@
 
         });
 
-
         // Create prefetch rules for our target page in resources
         const speculationRules = {
             prefetch: [{
@@ -71,17 +64,12 @@
         const expectedEvents = ['pending', 'ready', 'success'];
         let newWindow = null;
 
-        // Create target url with unique id to ensure events are from this test
-        const uuid = self.crypto.randomUUID();
-        const targetUrl = window.location.origin + "/infrastructure/testdriver/bidi/speculation/resources/target.html?" + uuid;
+        // Create prefetch rules for our target page in resources (different URL to avoid caching)
+        const targetUrl = window.location.origin + "/infrastructure/testdriver/bidi/speculation/resources/target.html?test=2";
 
         // Create a promise that resolves when we receive the 'success' event
         const successEventPromise = new Promise((resolve, reject) => {
             const removeHandler = test_driver.bidi.speculation.prefetch_status_updated.on((event) => {
-                // Ignore events from other tests that could be running in parallel.
-                if (event.url !== targetUrl) {
-                    return;
-                }
                 receivedEvents.push(event);
 
                 // When we receive the ready event, navigate to trigger success
@@ -125,21 +113,14 @@
     }, "prefetch_status_updated event with navigation to success");
 
     promise_test(async t => {
-
         const receivedEvents = [];
         const expectedEvents = ['pending', 'failure'];
 
-        // Create prefetch rules for a non-existent page that should fail with 404
-        const uuid = self.crypto.randomUUID();
-        const errorUrl = window.location.origin + "/infrastructure/testdriver/bidi/speculation/resources/nonexistent-404-page.html?" + uuid;
+        const errorUrl = window.location.origin + "/infrastructure/testdriver/bidi/speculation/resources/nonexistent-404-page.html";
 
         // Create a promise that resolves when we receive the 'failure' event
         const failureEventPromise = new Promise((resolve, reject) => {
             const removeHandler = test_driver.bidi.speculation.prefetch_status_updated.on((event) => {
-                // Ignore events from other tests that could be running in parallel.
-                if (event.url !== errorUrl) {
-                    return;
-                }
                 receivedEvents.push(event);
 
                 // When we receive the failure event, we're done

webdriver/tests/bidi/external/speculation/conftest.py

@@ -23,28 +23,6 @@ async def add_speculation_rules(context: Mapping[str, Any], rules: str):
 
     return add_speculation_rules
 
-
-@pytest.fixture
-def add_prefetch_link(bidi_session):
-    """Helper for adding links to the page that can be targeted by speculation rules."""
-    
-    async def add_link(context: Mapping[str, Any], href: str, text: str = "Test Link", link_id: str = "prefetch-page"):
-        """Add a link to the page for prefetch targeting."""
-        await bidi_session.script.evaluate(
-            expression=f"""
-                const link = document.createElement('a');
-                link.href = '{href}';
-                link.textContent = '{text}';
-                link.id = '{link_id}';
-                document.body.appendChild(link);
-            """,
-            target={"context": context["context"]},
-            await_promise=False
-        )
-    
-    return add_link
-
-
 @pytest.fixture
 def add_speculation_rules_and_link(bidi_session):
     """Helper for adding both speculation rules and a prefetch link to a page."""

webdriver/tests/bidi/external/speculation/prefetch_status_updated/prefetch_status_updated.py

@@ -3,25 +3,6 @@
 
 pytestmark = pytest.mark.asyncio
 
-@pytest.mark.asyncio
-async def test_subscribe_to_prefetch_status_updated(
-    bidi_session, subscribe_events, new_tab, url
-):
-    '''Test basic subscription to prefetch status updated events.'''
-    
-    # Subscribe to prefetch status updated events
-    await subscribe_events(events=["speculation.prefetchStatusUpdated"])
-    
-    # Navigate to a test page
-    test_url = url("/common/blank.html", protocol="https")
-    await bidi_session.browsing_context.navigate(
-        context=new_tab["context"],
-        url=test_url,
-        wait="complete",
-    )
-    
-    assert True
-
 @pytest.mark.asyncio
 async def test_speculation_rules_generate_ready_events(
     bidi_session, subscribe_events, new_tab, url, wait_for_events, add_speculation_rules_and_link
@@ -222,9 +203,6 @@ async def test_subscribe_unsubscribe_event_emission(
         # Wait for events to be emitted
         events = await waiter.get_events(lambda events: len(events) >= 2)
 
-    # Assert events were emitted while subscribed
-    assert len(events) >= 2, f"Expected at least 2 events while subscribed, got {len(events)}"
-    
     # Phase 2: Unsubscribe and assert events are NOT emitted
     await bidi_session.session.unsubscribe(subscriptions=[subscription_id])
 
@@ -249,7 +227,7 @@ async def test_subscribe_unsubscribe_event_emission(
         await add_speculation_rules_and_link(new_tab, speculation_rules_2, prefetch_target_2)
 
         with pytest.raises(TimeoutException):
-            await waiter.get_events(lambda events: len(events) >= 1, timeout=2)
+            await waiter.get_events(lambda events: len(events) >= 1, timeout=0.5)
 
 @pytest.mark.asyncio
 async def test_subscribe_unsubscribe_module_subscription(
@@ -283,9 +261,6 @@ async def test_subscribe_unsubscribe_module_subscription(
         # Wait for events to be emitted
         events = await waiter.get_events(lambda events: len(events) >= 2)
 
-    # Assert events were emitted while subscribed to module
-    assert len(events) >= 2, f"Expected at least 2 events while subscribed to module, got {len(events)}"
-    
     # Phase 2: Unsubscribe from module and assert events are NOT emitted
     await bidi_session.session.unsubscribe(subscriptions=[subscription_id])
 
@@ -310,7 +285,7 @@ async def test_subscribe_unsubscribe_module_subscription(
         await add_speculation_rules_and_link(new_tab, speculation_rules_2, prefetch_target_2)
 
         with pytest.raises(TimeoutException):
-            await waiter.get_events(lambda events: len(events) >= 1, timeout=2)
+            await waiter.get_events(lambda events: len(events) >= 1, timeout=0.5)
 
 @pytest.mark.asyncio
 async def test_unsubscribe_from_prefetch_status_updated(
@@ -325,6 +300,4 @@ async def test_unsubscribe_from_prefetch_status_updated(
     subscription_id = subscription_result["subscription"]
 
     # Unsubscribe immediately
-    await bidi_session.session.unsubscribe(subscriptions=[subscription_id])
-    
-    assert True
+    await bidi_session.session.unsubscribe(subscriptions=[subscription_id])