Merging upstream version 127.0.

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

5 files changed, 18 insertions, 45 deletions

diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py.ini
index 7b783752b4..de6c221775 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py.ini
@@ -16,3 +16,11 @@
   [test_capture_with_viewport[height larger-width larger\]]
     disabled:
       if os == "android": bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1840084
+
+  [test_capture_with_different_dpr[0.5\]]
+    disabled:
+      if os == "android": bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1840084
+
+  [test_capture_with_different_dpr[2\]]
+    disabled:
+      if os == "android": bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1840084
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/clip.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/clip.py.ini
index 60533fba25..763c93f85b 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/clip.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/clip.py.ini
@@ -1,3 +1,8 @@
 [clip.py]
-  expected:
-    if (processor == "x86") and not debug: [OK, TIMEOUT]
+  [test_clip_with_different_dpr[0.5\]]
+    disabled:
+      if os == "android": bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1840084
+
+  [test_clip_with_different_dpr[2\]]
+    disabled:
+      if os == "android": bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1840084
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py.ini
index 78cffcbc44..5dd5cecee7 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py.ini
@@ -10,4 +10,5 @@
 
   [test_redirect_navigation]
     expected:
+      if (processor == "x86_64") and (os == "win") and not debug: [PASS, FAIL]
       if (processor == "x86") and debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/set_viewport/device_pixel_ratio.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/set_viewport/device_pixel_ratio.py.ini
index 57b8a7029e..f8294d1c0c 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/set_viewport/device_pixel_ratio.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/set_viewport/device_pixel_ratio.py.ini
@@ -1,20 +1,3 @@
 [device_pixel_ratio.py]
-  [test_device_pixel_ratio_only[0.5\]]
-    bug: 1857961
-    expected: FAIL
-
-  [test_device_pixel_ratio_only[2\]]
-    bug: 1857961
-    expected: FAIL
-
-  [test_device_pixel_ratio_with_viewport[0.5\]]
-    bug: 1865618
-    expected: FAIL
-
-  [test_device_pixel_ratio_with_viewport[2\]]
-    bug: 1857961
-    expected: FAIL
-
-  [test_reset_device_pixel_ratio]
-    bug: 1857961
-    expected: FAIL
+  disabled:
+    if os == "android": bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1840084
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/set_viewport/invalid.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/set_viewport/invalid.py.ini
index bbbf87d899..773c05751b 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/set_viewport/invalid.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/set_viewport/invalid.py.ini
@@ -1,27 +1,3 @@
 [invalid.py]
   disabled:
     if os == "android": bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1840084
-
-  [test_params_devicePixelRatio_invalid_type[False\]]
-    bug: 1857961
-    expected: FAIL
-
-  [test_params_devicePixelRatio_invalid_type[\]]
-    bug: 1857961
-    expected: FAIL
-
-  [test_params_devicePixelRatio_invalid_type[device_pixel_ratio2\]]
-    bug: 1857961
-    expected: FAIL
-
-  [test_params_devicePixelRatio_invalid_type[device_pixel_ratio3\]]
-    bug: 1857961
-    expected: FAIL
-
-  [test_params_devicePixelRatio_invalid_value[0\]]
-    bug: 1857961
-    expected: FAIL
-
-  [test_params_devicePixelRatio_invalid_value[-1\]]
-    bug: 1857961
-    expected: FAIL