From 2692aaa2d6cbb1e80be4d9a391f7422bc274ad39 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 18 Jan 2023 03:43:50 +0000
Subject: [PATCH] Bug 1735923 - avoid caching effects with a different query
 parameter for each subtest r=padenot

to work around https://bugzilla.mozilla.org/show_bug.cgi?id=1129121

Differential Revision: https://phabricator.services.mozilla.com/D143866
---
 ...-canvas-tainting-video-with-range-request.https.html.ini | 3 ---
 ...etch-canvas-tainting-video-with-range-request.https.html | 6 ++++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/testing/web-platform/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini
index 72bb0a65e54e..0663dd1dfc24 100644
--- a/testing/web-platform/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini
@@ -1,9 +1,6 @@
 [fetch-canvas-tainting-video-with-range-request.https.html]
   expected:
     if (os == "android") and fission: [OK, TIMEOUT]
-  [range responses from multiple origins (cross-origin first)]
-    expected: FAIL
-
   [range responses from single origin with both opaque and non-opaque responses]
     expected:
       if (os == "win") and debug and (processor == "x86"): [FAIL, PASS]
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html
index 28c307180476..8fef9c34fa38 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html
@@ -18,6 +18,7 @@
 // byte range). Then the <video> element automatically makes ranged requests
 // (the "Range" HTTP request header specifies a byte range). The server responds
 // to these with 206 Partial Content for the given range.
+let unique = 0; // See https://bugzilla.mozilla.org/show_bug.cgi?id=1129121
 function range_request_test(script, expected, description) {
   promise_test(t => {
       let frame;
@@ -38,9 +39,10 @@ function range_request_test(script, expected, description) {
           })
         .then(f => {
             frame = f;
-            // Add "?VIDEO&PartialContent" to get a video resource from the
+            // Add "?PartialContent&VIDEO" to get a video resource from the
             // server using range requests.
-            const video_url = 'fetch-access-control.py?VIDEO&PartialContent';
+            const video_url =
+              'fetch-access-control.py?PartialContent&VIDEO=' + unique++;
             return frame.contentWindow.create_test_case_promise(video_url);
           })
         .then(result => {