Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 29 insertions, 28 deletions

diff --git a/testing/web-platform/meta/fetch/api/basic/conditional-get.any.js.ini b/testing/web-platform/meta/fetch/api/basic/conditional-get.any.js.ini
index a3a33547d8..19ed19ec80 100644
--- a/testing/web-platform/meta/fetch/api/basic/conditional-get.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/basic/conditional-get.any.js.ini
@@ -1,15 +1,11 @@
 [conditional-get.any.worker.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
+  [Testing conditional GET with ETags]
+    expected:
+      if (os == "android") and not debug: [PASS, FAIL]
+
 
 [conditional-get.any.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
 
 [conditional-get.any.serviceworker.html]
-  expected:
-    if (os == "android") and fission: [TIMEOUT, OK]
 
 [conditional-get.any.sharedworker.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/fetch/api/basic/request-upload.h2.any.js.ini b/testing/web-platform/meta/fetch/api/basic/request-upload.h2.any.js.ini
index 2cb877fc8e..efaa4370b1 100644
--- a/testing/web-platform/meta/fetch/api/basic/request-upload.h2.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/basic/request-upload.h2.any.js.ini
@@ -1,4 +1,5 @@
 [request-upload.h2.any.serviceworker.html]
+  expected: TIMEOUT
   [Fetch with POST with empty ReadableStream]
     expected: FAIL
 
@@ -29,8 +30,12 @@
   [Synchronous feature detect]
     expected: FAIL
 
+  [ReadbleStream should be closed on signal.abort]
+    expected: TIMEOUT
+
 
 [request-upload.h2.any.sharedworker.html]
+  expected: TIMEOUT
   [Fetch with POST with empty ReadableStream]
     expected: FAIL
 
@@ -61,8 +66,12 @@
   [Synchronous feature detect]
     expected: FAIL
 
+  [ReadbleStream should be closed on signal.abort]
+    expected: TIMEOUT
+
 
 [request-upload.h2.any.worker.html]
+  expected: TIMEOUT
   [Fetch with POST with empty ReadableStream]
     expected: FAIL
 
@@ -93,11 +102,14 @@
   [Synchronous feature detect]
     expected: FAIL
 
+  [ReadbleStream should be closed on signal.abort]
+    expected: TIMEOUT
+
 
 [request-upload.h2.any.html]
   expected:
     if (os == "mac") and not debug: [ERROR, OK]
-    if os == "android": OK
+    if os == "android": TIMEOUT
     ERROR
   [Fetch with POST with empty ReadableStream]
     expected: FAIL
@@ -128,3 +140,6 @@
 
   [Synchronous feature detect]
     expected: FAIL
+
+  [ReadbleStream should be closed on signal.abort]
+    expected: TIMEOUT
diff --git a/testing/web-platform/meta/fetch/api/redirect/redirect-keepalive.https.any.js.ini b/testing/web-platform/meta/fetch/api/redirect/redirect-keepalive.https.any.js.ini
index 43463d03c7..a437c2dbd7 100644
--- a/testing/web-platform/meta/fetch/api/redirect/redirect-keepalive.https.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/redirect/redirect-keepalive.https.any.js.ini
@@ -1,16 +1,16 @@
 [redirect-keepalive.https.any.html]
   expected:
-    if (os == "linux") and fission and not debug and (processor == "x86_64") and asan: [OK, TIMEOUT]
-    if (os == "linux") and fission and not debug and (processor == "x86_64") and not asan: [OK, TIMEOUT]
-    if (os == "linux") and fission and not debug and (processor == "x86"): [OK, TIMEOUT]
+    if (os == "linux") and fission and not debug and not asan and tsan: [TIMEOUT, OK]
+    if (os == "linux") and fission and not debug and not asan and not tsan: [OK, TIMEOUT]
+    if (os == "linux") and fission and not debug and asan: [TIMEOUT, OK]
+    if (os == "win") and (processor == "x86_64") and swgl: TIMEOUT
     if (os == "win") and (processor == "x86_64") and not swgl: [OK, TIMEOUT]
     if (os == "linux") and fission and debug: [OK, TIMEOUT]
-    if (os == "mac") and debug: TIMEOUT
   [[keepalive\][iframe\][load\] mixed content redirect; setting up]
     expected:
-      if (os == "linux") and fission and not debug and (processor == "x86_64") and asan: [PASS, TIMEOUT]
-      if (os == "linux") and fission and not debug and (processor == "x86_64") and not asan: [PASS, TIMEOUT]
-      if (os == "linux") and fission and not debug and (processor == "x86"): [PASS, TIMEOUT]
+      if (os == "linux") and fission and not debug and not asan and tsan: [TIMEOUT, PASS]
+      if (os == "linux") and fission and not debug and not asan and not tsan: [PASS, TIMEOUT]
+      if (os == "linux") and fission and not debug and asan: [TIMEOUT, PASS]
+      if (os == "win") and (processor == "x86_64") and swgl: TIMEOUT
       if (os == "win") and (processor == "x86_64") and not swgl: [PASS, TIMEOUT]
       if (os == "linux") and fission and debug: [PASS, TIMEOUT]
-      if (os == "mac") and debug: TIMEOUT
diff --git a/testing/web-platform/meta/fetch/api/request/request-init-priority.any.js.ini b/testing/web-platform/meta/fetch/api/request/request-init-priority.any.js.ini
index 56ad957c34..81477d0e16 100644
--- a/testing/web-platform/meta/fetch/api/request/request-init-priority.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/request/request-init-priority.any.js.ini
@@ -1,14 +1,4 @@
+prefs: [network.fetchpriority.enabled:true]
 [request-init-priority.any.html]
-  [new Request() throws a TypeError if any of RequestInit's members' values are invalid]
-    expected: FAIL
-
-  [fetch() with an invalid priority returns a rejected promise with a TypeError]
-    expected: FAIL
-
 
 [request-init-priority.any.worker.html]
-  [new Request() throws a TypeError if any of RequestInit's members' values are invalid]
-    expected: FAIL
-
-  [fetch() with an invalid priority returns a rejected promise with a TypeError]
-    expected: FAIL