- The goal of this manual test is to verify that observers that have
- registered "event" entry type can observe the long-latency input events,
- and verify the same behavior within iframe and in cross-frame scenario.
-
-
-
- Step 1: Click the "make busy" button to make main-thread busy for 2 seconds.
-
-
- Step 2: do several clicks on "click while busy" while busy to generate long-latency inputs.
-
-
- Step 3: observe in the "timeline" section that the long-latency clicks are captured by the observer.
-
-
- Step 4: do step 1 to step 3 for the iframe. Observe that the observers only observe input events within its frame.
-
-
-
+
diff --git a/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js b/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
index 83f1bc7f32a..3ba272f9341 100644
--- a/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
+++ b/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js
@@ -3,10 +3,6 @@
// where appropriate. Calls |callback| during event handler.
function clickOnElement(id, callback) {
const element = document.getElementById(id);
- const rect = element.getBoundingClientRect();
- const xCenter = rect.x + rect.width / 2;
- const yCenter = rect.y + rect.height / 2;
- const leftButton = 0;
const clickHandler = () => {
mainThreadBusy(120);
if (callback)
diff --git a/tests/wpt/web-platform-tests/event-timing/resources/observer-manual-childframe.html b/tests/wpt/web-platform-tests/event-timing/resources/observer-manual-childframe.html
deleted file mode 100644
index a27272c7b9b..00000000000
--- a/tests/wpt/web-platform-tests/event-timing/resources/observer-manual-childframe.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
Actions:
-
- Make busy
- click while busy
-
-
Timeline:
-
-
-
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html
index b10b2f0b73c..65490f0a138 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html
@@ -109,7 +109,7 @@ function test(
const cache = await caches.open('v1');
if (response_type === 'error') {
- await promise_rejects(t, new TypeError(), cache.match(url));
+ await promise_rejects(t, 'InvalidAccessError', cache.match(url));
return;
}
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/adopt-from-image-document.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/adopt-from-image-document.html
new file mode 100644
index 00000000000..30729fc81cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/adopt-from-image-document.html
@@ -0,0 +1,16 @@
+
+
Adopt img from image document
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-iframe.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-iframe.html
index 56060cb5d64..dceaa0d3ace 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-iframe.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-iframe.html
@@ -3,7 +3,7 @@
HTMLImageElement.prototype.decode(), iframe tests.
-
+
@@ -23,7 +23,7 @@ promise_test(function() {
// At this point the frame which created the img is removed, so decode() should fail.
frame.parentNode.removeChild(frame);
img.decode().then(function() {
- assert_false(true, "Unexpected success");
+ assert_unreached("Unexpected success");
}, function() {
resolve();
});
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-image-document.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-image-document.html
new file mode 100644
index 00000000000..e54ae223a00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-image-document.html
@@ -0,0 +1,25 @@
+
+
HTMLImageElement.prototype.decode(), image document tests.
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini
new file mode 100644
index 00000000000..0bbb2bf0aa5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini
@@ -0,0 +1,2 @@
+[fuzzy-ref-2.html]
+ fuzzy: maxDifference=255;100-100
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html.ini
new file mode 100644
index 00000000000..1e13cec6ac4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html.ini
@@ -0,0 +1,2 @@
+[reftest_and_fail_0-ref.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html.ini
new file mode 100644
index 00000000000..9a0066917e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html.ini
@@ -0,0 +1,2 @@
+[reftest_cycle_fail_0-ref.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_chain_ini.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_chain_ini.html.ini
rename to tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_and_fail.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_and_fail.html.ini
deleted file mode 100644
index 81aef049cd1..00000000000
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_and_fail.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[reftest_and_fail.html]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_cycle_fail.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_cycle_fail.html.ini
deleted file mode 100644
index 472b33f7764..00000000000
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_cycle_fail.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[reftest_cycle_fail.html]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-0.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-0.html.ini
new file mode 100644
index 00000000000..f90b3d68475
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-0.html.ini
@@ -0,0 +1,2 @@
+[reftest_match_and_mismatch-0.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-1.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-1.html.ini
new file mode 100644
index 00000000000..eeb9fc582dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-1.html.ini
@@ -0,0 +1,2 @@
+[reftest_match_and_mismatch-1.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-4.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-4.html.ini
new file mode 100644
index 00000000000..77c7ba227d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-4.html.ini
@@ -0,0 +1,2 @@
+[reftest_match_and_mismatch-4.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-5.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-5.html.ini
new file mode 100644
index 00000000000..e87acf9b679
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-5.html.ini
@@ -0,0 +1,2 @@
+[reftest_match_and_mismatch-5.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-6.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-6.html.ini
new file mode 100644
index 00000000000..e3089dd1031
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-6.html.ini
@@ -0,0 +1,2 @@
+[reftest_match_and_mismatch-6.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-7.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-7.html.ini
new file mode 100644
index 00000000000..09162d88018
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-7.html.ini
@@ -0,0 +1,2 @@
+[reftest_match_and_mismatch-7.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-0.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-0.html.ini
new file mode 100644
index 00000000000..6bc0bef41d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-0.html.ini
@@ -0,0 +1,2 @@
+[reftest_multiple_mismatch-0.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-1.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-1.html.ini
new file mode 100644
index 00000000000..964858b1acd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-1.html.ini
@@ -0,0 +1,2 @@
+[reftest_multiple_mismatch-1.html]
+ expected: FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
deleted file mode 100644
index 9ae71a6e73e..00000000000
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementPosition.html]
- [TestDriver actions: element position]
- expected:
- if product == "safari": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementTiming.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementTiming.html.ini
deleted file mode 100644
index fb4b51df66d..00000000000
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementTiming.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementTiming.html]
- [TestDriver actions: element timing]
- expected:
- if product == "safari": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/bless.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/bless.html.ini
deleted file mode 100644
index d652b02787f..00000000000
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/bless.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[bless.html]
- expected:
- if product == "safari": TIMEOUT
-
- [functions in the absence of a `body` element]
- expected:
- if product == "safari": TIMEOUT
-
- [user activation]
- expected:
- if product == "safari": NOTRUN
-
- [no action function provided]
- expected:
- if product == "safari": NOTRUN
-
- [synchronous return value]
- expected:
- if product == "safari": NOTRUN
-
- [synchronous error]
- expected:
- if product == "safari": NOTRUN
-
- [asynchronous return value]
- expected:
- if product == "safari": NOTRUN
-
- [asynchronous error]
- expected:
- if product == "safari": NOTRUN
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/README.md b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/README.md
new file mode 100644
index 00000000000..01bb6f773e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/README.md
@@ -0,0 +1,5 @@
+This directory contains the old reftest chaining tests, based on how they worked prior to
+[RFC #15](https://github.com/web-platform-tests/rfcs/blob/master/rfcs/reftest_simplification.md).
+
+The expectations for these match the current logic; these are included here so we have
+tests that fail if any external runner is implementing this logic.
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/fuzzy-ref-2.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/fuzzy-ref-2.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/fuzzy-ref-2.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/fuzzy-ref-2.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/fuzzy-ref-2a.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/fuzzy-ref-2a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/fuzzy-ref-2a.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/fuzzy-ref-2a.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_fail.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_fail.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_fail_0-ref.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html
similarity index 66%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_fail_0-ref.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html
index 04fb9aa1517..565f663ed50 100644
--- a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_fail_0-ref.html
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html
@@ -1,5 +1,5 @@
Reftest chain that should fail
-
+
\ No newline at end of file
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_mismatch.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_mismatch.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_mismatch_0.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch_0.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_mismatch_0.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch_0.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_mismatch_1.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch_1.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_and_mismatch_1.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch_1.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle_0-ref.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_0-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle_0-ref.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_0-ref.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle_1-ref.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_1-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle_1-ref.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_1-ref.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle_fail.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_fail.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle_fail.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_fail.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle_fail_0-ref.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_cycle_fail_0-ref.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_chain_ini.html b/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_chain_ini.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-0.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-0.html
new file mode 100644
index 00000000000..9f52615a64a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-0.html
@@ -0,0 +1,6 @@
+
AND match/mismatch that should fail
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-1.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-1.html
new file mode 100644
index 00000000000..1bba49ea0d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-1.html
@@ -0,0 +1,6 @@
+
AND match/mismatch that should fail
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-2.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-2.html
new file mode 100644
index 00000000000..60141aedf80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-2.html
@@ -0,0 +1,7 @@
+
OR match AND mismatch that should pass
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-3.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-3.html
new file mode 100644
index 00000000000..f707c1b13fe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-3.html
@@ -0,0 +1,7 @@
+
OR match AND mismatch that should pass
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-4.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-4.html
new file mode 100644
index 00000000000..ac08cb70b63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-4.html
@@ -0,0 +1,7 @@
+
OR match AND mismatch that should fail
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-5.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-5.html
new file mode 100644
index 00000000000..b30d84a2dd4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-5.html
@@ -0,0 +1,7 @@
+
OR match AND mismatch that should fail
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-6.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-6.html
new file mode 100644
index 00000000000..1a2dcc204ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-6.html
@@ -0,0 +1,8 @@
+
OR match AND mismatch that should fail
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-7.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-7.html
new file mode 100644
index 00000000000..073e2206111
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-7.html
@@ -0,0 +1,8 @@
+
OR match AND mismatch that should fail
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_or_0.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-0.html
similarity index 100%
rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_or_0.html
rename to tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-0.html
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-1.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-1.html
new file mode 100644
index 00000000000..9a8b769d65e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-1.html
@@ -0,0 +1,6 @@
+
OR match that should pass
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-0.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-0.html
new file mode 100644
index 00000000000..b0115a7551c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-0.html
@@ -0,0 +1,6 @@
+
AND mismatch that should fail
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-1.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-1.html
new file mode 100644
index 00000000000..65ddd34324a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-1.html
@@ -0,0 +1,6 @@
+
AND mismatch that should fail
+
+
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload.sub.html b/tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload.sub.html
index 451ae500f07..0490e89c422 100644
--- a/tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload.sub.html
+++ b/tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload.sub.html
@@ -13,7 +13,7 @@ promise_test(() => {
let form = document.getElementById("form");
let input = document.getElementById("file_input");
return test_driver
- .send_keys(input, "{{fs_path(file_upload_data.txt)}}")
+ .send_keys(input, String.raw`{{fs_path(file_upload_data.txt)}}`)
.then(() =>
fetch("file_upload.py",
{method: "POST",
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
index 15e14dce5ef..a819a3b425b 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
@@ -209,6 +209,12 @@ class MockRuntime {
"bounded-floor": device.mojom.XRSessionFeature.REF_SPACE_BOUNDED_FLOOR,
"unbounded": device.mojom.XRSessionFeature.REF_SPACE_UNBOUNDED };
+ static sessionModeToMojoMap = {
+ "inline": device.mojom.XRSessionMode.kInline,
+ "immersive-vr": device.mojom.XRSessionMode.kImmersiveVr,
+ "immersive-ar": device.mojom.XRSessionMode.kImmersiveAr,
+ };
+
constructor(fakeDeviceInit, service) {
this.sessionClient_ = new device.mojom.XRSessionClientPtr();
this.presentation_provider_ = new MockXRPresentationProvider();
@@ -225,16 +231,38 @@ class MockRuntime {
this.input_sources_ = [];
this.next_input_source_index_ = 1;
- // Initialize DisplayInfo first to set the defaults, then override with
- // anything from the deviceInit
- if (fakeDeviceInit.supportsImmersive) {
- this.displayInfo_ = this.getImmersiveDisplayInfo();
+ let supportedModes = [];
+ if (fakeDeviceInit.supportedModes) {
+ supportedModes = fakeDeviceInit.supportedModes.slice();
+ if(fakeDeviceInit.supportedModes.length === 0) {
+ supportedModes = ["inline"];
+ }
} else {
- this.displayInfo_ = this.getNonImmersiveDisplayInfo();
+ // Back-compat mode.
+ console.warn("Please use `supportedModes` to signal which modes are supported by this device.");
+ if(fakeDeviceInit.supportsImmersive == null) {
+ throw new TypeError("'supportsImmersive' must be set");
+ }
+
+ supportedModes = ["inline"];
+ if(fakeDeviceInit.supportsImmersive) {
+ supportedModes.push("immersive-vr");
+ }
}
- if (fakeDeviceInit.supportsEnvironmentIntegration) {
- this.displayInfo_.capabilities.canProvideEnvironmentIntegration = true;
+ this.supportedModes_ = this._convertModesToEnum(supportedModes);
+
+ // Initialize DisplayInfo first to set the defaults, then override with
+ // anything from the deviceInit
+ if(this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveVr)
+ || this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveAr)) {
+ this.displayInfo_ = this.getImmersiveDisplayInfo();
+ } else if (this.supportedModes_.includes(device.mojom.XRSessionMode.kInline)) {
+ this.displayInfo_ = this.getNonImmersiveDisplayInfo();
+ } else {
+ // This should never happen!
+ console.error("Device has empty supported modes array!");
+ throw new InvalidStateError();
}
if (fakeDeviceInit.viewerOrigin != null) {
@@ -245,6 +273,10 @@ class MockRuntime {
this.setFloorOrigin(fakeDeviceInit.floorOrigin);
}
+ if (fakeDeviceInit.world) {
+ this.world_ = fakeDeviceInit.world;
+ }
+
// This appropriately handles if the coordinates are null
this.setBoundsGeometry(fakeDeviceInit.boundsCoordinates);
@@ -254,6 +286,17 @@ class MockRuntime {
this.setFeatures(fakeDeviceInit.supportedFeatures || []);
}
+ _convertModeToEnum(sessionMode) {
+ if(sessionMode in MockRuntime.sessionModeToMojoMap)
+ return MockRuntime.sessionModeToMojoMap[sessionMode];
+
+ throw new TypeError("Unrecognized value for XRSessionMode enum: " + sessionMode);
+ }
+
+ _convertModesToEnum(sessionModes) {
+ return sessionModes.map(mode => this._convertModeToEnum(mode));
+ }
+
// Test API methods.
disconnect() {
this.service_.removeRuntime(this);
@@ -632,13 +675,10 @@ class MockRuntime {
}
runtimeSupportsSession(options) {
-
- let isInlineRequest = (options.mode === device.mojom.XRSessionMode.kInline);
return Promise.resolve({
- supportsSession:
- isInlineRequest || this.displayInfo_.capabilities.canPresent
+ supportsSession: this.supportedModes_.includes(options.mode)
});
- };
+ }
}
class MockXRSessionMetricsRecorder {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ready.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/ready.https.html
deleted file mode 100644
index 6c1ed822a87..00000000000
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/ready.https.html
+++ /dev/null
@@ -1,317 +0,0 @@
-
-
Service Worker: navigator.serviceWorker.ready
-
-
-
-
-
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ready.https.window.js b/tests/wpt/web-platform-tests/service-workers/service-worker/ready.https.window.js
new file mode 100644
index 00000000000..6c4e270682c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/ready.https.window.js
@@ -0,0 +1,223 @@
+// META: title=Service Worker: navigator.serviceWorker.ready
+// META: script=resources/test-helpers.sub.js
+
+test(() => {
+ assert_equals(
+ navigator.serviceWorker.ready,
+ navigator.serviceWorker.ready,
+ 'repeated access to ready without intervening registrations should return the same Promise object'
+ );
+}, 'ready returns the same Promise object');
+
+promise_test(async t => {
+ const frame = await with_iframe('resources/blank.html?uncontrolled');
+ t.add_cleanup(() => frame.remove());
+
+ const promise = frame.contentWindow.navigator.serviceWorker.ready;
+
+ assert_equals(
+ Object.getPrototypeOf(promise),
+ frame.contentWindow.Promise.prototype,
+ 'the Promise should be in the context of the related document'
+ );
+}, 'ready returns a Promise object in the context of the related document');
+
+promise_test(async t => {
+ const url = 'resources/empty-worker.js';
+ const scope = 'resources/blank.html?ready-controlled';
+ const expectedURL = normalizeURL(url);
+ const registration = await service_worker_unregister_and_register(t, url, scope);
+ t.add_cleanup(() => registration.unregister());
+
+ await wait_for_state(t, registration.installing, 'activated');
+
+ const frame = await with_iframe(scope);
+ t.add_cleanup(() => frame.remove());
+
+ const readyReg = await frame.contentWindow.navigator.serviceWorker.ready;
+
+ assert_equals(readyReg.installing, null, 'installing should be null');
+ assert_equals(readyReg.waiting, null, 'waiting should be null');
+ assert_equals(readyReg.active.scriptURL, expectedURL, 'active after ready should not be null');
+ assert_equals(
+ frame.contentWindow.navigator.serviceWorker.controller,
+ readyReg.active,
+ 'the controller should be the active worker'
+ );
+ assert_in_array(
+ readyReg.active.state,
+ ['activating', 'activated'],
+ '.ready should be resolved when the registration has an active worker'
+ );
+}, 'ready on a controlled document');
+
+promise_test(async t => {
+ const url = 'resources/empty-worker.js';
+ const scope = 'resources/blank.html?ready-potential-controlled';
+ const expected_url = normalizeURL(url);
+ const frame = await with_iframe(scope);
+ t.add_cleanup(() => frame.remove());
+
+ const registration = await navigator.serviceWorker.register(url, { scope });
+ t.add_cleanup(() => registration.unregister());
+
+ const readyReg = await frame.contentWindow.navigator.serviceWorker.ready;
+
+ assert_equals(readyReg.installing, null, 'installing should be null');
+ assert_equals(readyReg.waiting, null, 'waiting should be null.')
+ assert_equals(readyReg.active.scriptURL, expected_url, 'active after ready should not be null');
+ assert_in_array(
+ readyReg.active.state,
+ ['activating', 'activated'],
+ '.ready should be resolved when the registration has an active worker'
+ );
+ assert_equals(
+ frame.contentWindow.navigator.serviceWorker.controller,
+ null,
+ 'uncontrolled document should not have a controller'
+ );
+}, 'ready on a potential controlled document');
+
+promise_test(async t => {
+ const url = 'resources/empty-worker.js';
+ const scope = 'resources/blank.html?ready-installing';
+
+ await service_worker_unregister(t, scope);
+
+ const frame = await with_iframe(scope);
+ const promise = frame.contentWindow.navigator.serviceWorker.ready;
+ navigator.serviceWorker.register(url, { scope });
+ const registration = await promise;
+
+ t.add_cleanup(async () => {
+ await registration.unregister();
+ frame.remove();
+ });
+
+ assert_equals(registration.installing, null, 'installing should be null');
+ assert_equals(registration.waiting, null, 'waiting should be null');
+ assert_not_equals(registration.active, null, 'active after ready should not be null');
+ assert_in_array(
+ registration.active.state,
+ ['activating', 'activated'],
+ '.ready should be resolved when the registration has an active worker'
+ );
+}, 'ready on an iframe whose parent registers a new service worker');
+
+promise_test(async t => {
+ const scope = 'resources/register-iframe.html';
+ const frame = await with_iframe(scope);
+
+ const registration = await frame.contentWindow.navigator.serviceWorker.ready;
+
+ t.add_cleanup(async () => {
+ await registration.unregister();
+ frame.remove();
+ });
+
+ assert_equals(registration.installing, null, 'installing should be null');
+ assert_equals(registration.waiting, null, 'waiting should be null');
+ assert_not_equals(registration.active, null, 'active after ready should not be null');
+ assert_in_array(
+ registration.active.state,
+ ['activating', 'activated'],
+ '.ready should be resolved with "active worker"'
+ );
+ }, 'ready on an iframe that installs a new service worker');
+
+promise_test(async t => {
+ const url = 'resources/empty-worker.js';
+ const matchedScope = 'resources/blank.html?ready-after-match';
+ const longerMatchedScope = 'resources/blank.html?ready-after-match-longer';
+
+ await service_worker_unregister(t, matchedScope);
+ await service_worker_unregister(t, longerMatchedScope);
+
+ const frame = await with_iframe(longerMatchedScope);
+ const registration = await navigator.serviceWorker.register(url, { scope: matchedScope });
+
+ t.add_cleanup(async () => {
+ await registration.unregister();
+ frame.remove();
+ });
+
+ await wait_for_state(t, registration.installing, 'activated');
+
+ const longerRegistration = await navigator.serviceWorker.register(url, { scope: longerMatchedScope });
+
+ t.add_cleanup(() => longerRegistration.unregister());
+
+ const readyReg = await frame.contentWindow.navigator.serviceWorker.ready;
+
+ assert_equals(
+ readyReg.scope,
+ normalizeURL(longerMatchedScope),
+ 'longer matched registration should be returned'
+ );
+ assert_equals(
+ frame.contentWindow.navigator.serviceWorker.controller,
+ null,
+ 'controller should be null'
+ );
+}, 'ready after a longer matched registration registered');
+
+promise_test(async t => {
+ const url = 'resources/empty-worker.js';
+ const matchedScope = 'resources/blank.html?ready-after-resolve';
+ const longerMatchedScope = 'resources/blank.html?ready-after-resolve-longer';
+ const registration = await service_worker_unregister_and_register(t, url, matchedScope);
+ t.add_cleanup(() => registration.unregister());
+
+ await wait_for_state(t, registration.installing, 'activated');
+
+ const frame = await with_iframe(longerMatchedScope);
+ t.add_cleanup(() => frame.remove());
+
+ const readyReg1 = await frame.contentWindow.navigator.serviceWorker.ready;
+
+ assert_equals(
+ readyReg1.scope,
+ normalizeURL(matchedScope),
+ 'matched registration should be returned'
+ );
+
+ const longerReg = await navigator.serviceWorker.register(url, { scope: longerMatchedScope });
+ t.add_cleanup(() => longerReg.unregister());
+
+ const readyReg2 = await frame.contentWindow.navigator.serviceWorker.ready;
+
+ assert_equals(
+ readyReg2.scope,
+ normalizeURL(matchedScope),
+ 'ready should only be resolved once'
+ );
+}, 'access ready after it has been resolved');
+
+promise_test(async t => {
+ const url1 = 'resources/empty-worker.js';
+ const url2 = url1 + '?2';
+ const matchedScope = 'resources/blank.html?ready-after-unregister';
+ const reg1 = await service_worker_unregister_and_register(t, url1, matchedScope);
+ t.add_cleanup(() => reg1.unregister());
+
+ await wait_for_state(t, reg1.installing, 'activating');
+
+ const frame = await with_iframe(matchedScope);
+ t.add_cleanup(() => frame.remove());
+
+ await reg1.unregister();
+
+ // Ready promise should be pending, waiting for a new registration to arrive
+ const readyPromise = frame.contentWindow.navigator.serviceWorker.ready;
+
+ const reg2 = await navigator.serviceWorker.register(url2, { scope: matchedScope });
+ t.add_cleanup(() => reg2.unregister());
+
+ const readyReg = await readyPromise;
+
+ // Wait for registration update, since it comes from another global, the states are racy.
+ await wait_for_state(t, reg2.installing || reg2.waiting || reg2.active, 'activated');
+
+ assert_equals(readyReg.active.scriptURL, reg2.active.scriptURL, 'Resolves with the second registration');
+ assert_not_equals(reg1, reg2, 'Registrations should be different');
+}, 'resolve ready after unregistering');
diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb b/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
index b32739be58a..a3772b75e46 100644
--- a/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
+++ b/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
@@ -1,10 +1,10 @@
cask 'safari-technology-preview' do
if MacOS.version <= :mojave
- version '96,061-44056-20191120-ac7bb196-2724-4840-bce9-6c83ecdbfb2c'
- sha256 'e80ceacdff7e75218365993e5af1c81c9bcc4785291ae00abba3d14ac5614317'
+ version '97,061-62396-20191217-bcf15e6a-ba77-4912-bd7a-5c136c6a9bb0'
+ sha256 '75678852258e1869daf69e853b345556fea05adcd5d71530501c3be584212830'
else
- version '96,061-47718-20191120-02bc7569-ee6b-4c28-9ec4-0ceeda3c3c3a'
- sha256 'bbfcdc36bf9b55aec5838d66e34c41dd3f6a64091406bc38f45c888360f191fe'
+ version '97,061-62395-20191217-fd754f32-1f09-4449-8aab-ebb9ba1ab1c4'
+ sha256 'bfce6e57c4aad6b0423cabc54176de1e3115c656496a5a28dd91a7b78e16bf58'
end
url "https://secure-appldnld.apple.com/STP/#{version.after_comma}/SafariTechnologyPreview.dmg"
diff --git a/tests/wpt/web-platform-tests/tools/manifest/item.py b/tests/wpt/web-platform-tests/tools/manifest/item.py
index 1c4034ad05f..fd3564bbe27 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/item.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/item.py
@@ -1,4 +1,3 @@
-from copy import copy
from inspect import isabstract
from six import iteritems, with_metaclass
from six.moves.urllib.parse import urljoin, urlparse
@@ -196,9 +195,11 @@ class TestharnessTest(URLManifestItem):
return rv
-class RefTestBase(URLManifestItem):
+class RefTest(URLManifestItem):
__slots__ = ("references",)
+ item_type = "reftest"
+
def __init__(self,
tests_root, # type: Text
path, # type: Text
@@ -207,7 +208,7 @@ class RefTestBase(URLManifestItem):
references=None, # type: Optional[List[Tuple[Text, Text]]]
**extras # type: Any
):
- super(RefTestBase, self).__init__(tests_root, path, url_base, url, **extras)
+ super(RefTest, self).__init__(tests_root, path, url_base, url, **extras)
if references is None:
self.references = [] # type: List[Tuple[Text, Text]]
else:
@@ -266,7 +267,7 @@ class RefTestBase(URLManifestItem):
path, # type: Text
obj # type: Tuple[Text, List[Tuple[Text, Text]], Dict[Any, Any]]
):
- # type: (...) -> RefTestBase
+ # type: (...) -> RefTest
tests_root = manifest.tests_root
assert tests_root is not None
path = to_os_path(path)
@@ -278,38 +279,6 @@ class RefTestBase(URLManifestItem):
references,
**extras)
- def to_RefTest(self):
- # type: () -> RefTest
- if type(self) == RefTest:
- assert isinstance(self, RefTest)
- return self
- rv = copy(self)
- rv.__class__ = RefTest
- assert isinstance(rv, RefTest)
- return rv
-
- def to_RefTestNode(self):
- # type: () -> RefTestNode
- if type(self) == RefTestNode:
- assert isinstance(self, RefTestNode)
- return self
- rv = copy(self)
- rv.__class__ = RefTestNode
- assert isinstance(rv, RefTestNode)
- return rv
-
-
-class RefTestNode(RefTestBase):
- __slots__ = ()
-
- item_type = "reftest_node"
-
-
-class RefTest(RefTestBase):
- __slots__ = ()
-
- item_type = "reftest"
-
class ManualTest(URLManifestItem):
__slots__ = ()
diff --git a/tests/wpt/web-platform-tests/tools/manifest/manifest.py b/tests/wpt/web-platform-tests/tools/manifest/manifest.py
index 2ad7fccf486..bfac309c86a 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/manifest.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/manifest.py
@@ -1,12 +1,11 @@
-import itertools
import json
import os
-from collections import MutableMapping, defaultdict
+from collections import MutableMapping
from six import iteritems, iterkeys, itervalues, string_types, binary_type, text_type
from . import vcs
-from .item import (ConformanceCheckerTest, ManifestItem, ManualTest, RefTest, RefTestNode,
- SupportFile, TestharnessTest, VisualTest, WebDriverSpecTest, CrashTest)
+from .item import (ConformanceCheckerTest, ManifestItem, ManualTest, RefTest, SupportFile,
+ TestharnessTest, VisualTest, WebDriverSpecTest, CrashTest)
from .log import get_logger
from .sourcefile import SourceFile
from .utils import from_os_path, to_os_path
@@ -28,7 +27,6 @@ if MYPY:
from typing import Tuple
from typing import Type
from typing import Union
- from typing import cast
try:
import ujson
@@ -49,7 +47,6 @@ class ManifestVersionMismatch(ManifestError):
item_classes = {"testharness": TestharnessTest,
"reftest": RefTest,
- "reftest_node": RefTestNode,
"crashtest": CrashTest,
"manual": ManualTest,
"wdspec": WebDriverSpecTest,
@@ -247,7 +244,6 @@ class Manifest(object):
assert url_base is not None
self._path_hash = {} # type: Dict[Text, Tuple[Text, Text]]
self._data = ManifestData(self) # type: ManifestData
- self._reftest_nodes_by_url = None # type: Optional[Dict[Text, Union[RefTest, RefTestNode]]]
self.tests_root = tests_root # type: Optional[str]
self.url_base = url_base # type: Text
@@ -280,23 +276,6 @@ class Manifest(object):
for test in tests:
yield test
- @property
- def reftest_nodes_by_url(self):
- # type: () -> Dict[Text, Union[RefTest, RefTestNode]]
- if self._reftest_nodes_by_url is None:
- by_url = {}
- for path, nodes in itertools.chain(iteritems(self._data["reftest"]),
- iteritems(self._data["reftest_node"])):
- for node in nodes:
- assert isinstance(node, (RefTest, RefTestNode))
- by_url[node.url] = node
- self._reftest_nodes_by_url = by_url
- return self._reftest_nodes_by_url
-
- def get_reference(self, url):
- # type: (Text) -> Optional[ManifestItem]
- return self.reftest_nodes_by_url.get(url)
-
def update(self, tree):
# type: (Iterable[Tuple[Union[SourceFile, bytes], bool]]) -> bool
"""Update the manifest given an iterable of items that make up the updated manifest.
@@ -306,11 +285,9 @@ class Manifest(object):
unusual API is designed as an optimistaion meaning that SourceFile items need not be
constructed in the case we are not updating a path, but the absence of an item from
the iterator may be used to remove defunct entries from the manifest."""
- all_reftest_nodes = [] # type: List[Tuple[ManifestItem, Text]]
seen_files = set() # type: Set[Text]
changed = False
- reftest_changes = False
# Create local variable references to these dicts so we avoid the
# attribute access in the hot loop below
@@ -319,8 +296,6 @@ class Manifest(object):
prev_files = data.paths() # type: Set[Text]
- reftest_types = ("reftest", "reftest_node")
-
for source_file, update in tree:
if not update:
assert isinstance(source_file, (binary_type, text_type))
@@ -328,9 +303,6 @@ class Manifest(object):
seen_files.add(rel_path)
assert rel_path in path_hash
old_hash, old_type = path_hash[rel_path] # type: Tuple[Text, Text]
- if old_type in reftest_types:
- manifest_items = data[old_type][rel_path] # type: Iterable[ManifestItem]
- all_reftest_nodes.extend((item, old_hash) for item in manifest_items)
else:
assert not isinstance(source_file, bytes)
rel_path = source_file.rel_path
@@ -344,28 +316,14 @@ class Manifest(object):
if not is_new:
old_hash, old_type = path_hash[rel_path]
if old_hash != file_hash:
- new_type, manifest_items = source_file.manifest_items()
hash_changed = True
- if new_type != old_type:
- del data[old_type][rel_path]
- if old_type in reftest_types:
- reftest_changes = True
- else:
- new_type = old_type
- if old_type in reftest_types:
- manifest_items = data[old_type][rel_path]
- else:
- new_type, manifest_items = source_file.manifest_items()
-
- if new_type in reftest_types:
- all_reftest_nodes.extend((item, file_hash) for item in manifest_items)
- if is_new or hash_changed:
- reftest_changes = True
- elif is_new or hash_changed:
- data[new_type][rel_path] = set(manifest_items)
if is_new or hash_changed:
+ new_type, manifest_items = source_file.manifest_items()
+ data[new_type][rel_path] = set(manifest_items)
path_hash[rel_path] = (file_hash, new_type)
+ if hash_changed and new_type != old_type:
+ del data[old_type][rel_path]
changed = True
deleted = prev_files - seen_files
@@ -374,8 +332,6 @@ class Manifest(object):
for rel_path in deleted:
if rel_path in path_hash:
_, old_type = path_hash[rel_path]
- if old_type in reftest_types:
- reftest_changes = True
del path_hash[rel_path]
try:
del data[old_type][rel_path]
@@ -386,65 +342,8 @@ class Manifest(object):
if rel_path in test_data:
del test_data[rel_path]
- if reftest_changes:
- reftests, reftest_nodes, changed_hashes = self._compute_reftests(all_reftest_nodes)
- reftest_data = data["reftest"]
- reftest_data.clear()
- for path, items in iteritems(reftests):
- if MYPY:
- reftest_data[path] = cast(Set[ManifestItem], items)
- else:
- reftest_data[path] = items
-
- reftest_node_data = data["reftest_node"]
- reftest_node_data.clear()
- for node_path, node_items in iteritems(reftest_nodes):
- if MYPY:
- reftest_node_data[node_path] = cast(Set[ManifestItem], node_items)
- else:
- reftest_node_data[node_path] = node_items
-
- path_hash.update(changed_hashes)
-
return changed
- def _compute_reftests(self,
- reftest_nodes # type: List[Tuple[ManifestItem, Text]]
- ):
- # type: (...) -> Tuple[Dict[Text, Set[RefTest]], Dict[Text, Set[RefTestNode]], Dict[Text, Tuple[Text, Text]]]
- self._reftest_nodes_by_url = {}
- has_inbound = set()
- for item, _ in reftest_nodes:
- assert isinstance(item, (RefTestNode, RefTest))
- for ref_url, ref_type in item.references:
- has_inbound.add(ref_url)
-
- reftests = defaultdict(set) # type: Dict[Text, Set[RefTest]]
- references = defaultdict(set) # type: Dict[Text, Set[RefTestNode]]
- changed_hashes = {} # type: Dict[Text, Tuple[Text, Text]]
-
- for item, file_hash in reftest_nodes:
- assert isinstance(item, (RefTestNode, RefTest))
- if item.url in has_inbound:
- # This is a reference
- if isinstance(item, RefTest):
- item = item.to_RefTestNode()
- changed_hashes[item.path] = (file_hash,
- item.item_type)
- assert isinstance(item, RefTestNode)
- references[item.path].add(item)
- else:
- if isinstance(item, RefTestNode):
- item = item.to_RefTest()
- changed_hashes[item.path] = (file_hash,
- item.item_type)
- assert isinstance(item, RefTest)
- reftests[item.path].add(item)
- assert isinstance(item, (RefTestNode, RefTest))
- self._reftest_nodes_by_url[item.url] = item
-
- return reftests, references, changed_hashes
-
def to_json(self):
# type: () -> Dict[Text, Any]
out_items = {
@@ -470,7 +369,28 @@ class Manifest(object):
self._path_hash = {to_os_path(k): v for k, v in iteritems(obj["paths"])}
+ # merge reftest_node and reftest
+ # TODO(MANIFESTv8): remove this condition
+ if "reftest_node" in obj["items"]:
+ for path in obj["items"]["reftest_node"]:
+ os_path = to_os_path(path)
+ old_hash, old_type = self._path_hash[os_path]
+ self._path_hash[os_path] = (old_hash, "reftest")
+
for test_type, type_paths in iteritems(obj["items"]):
+ # merge reftest_node and reftest
+ # TODO(MANIFESTv8): remove this condition
+ if test_type in ("reftest", "reftest_node"):
+ if types and "reftest" not in types:
+ continue
+
+ if self._data["reftest"].json_data:
+ self._data["reftest"].json_data.update(type_paths)
+ else:
+ self._data["reftest"].set_json(tests_root, type_paths)
+
+ continue
+
if test_type not in item_classes:
raise ManifestError
diff --git a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
index b9dcc8f5363..800d1f981cc 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
@@ -33,7 +33,7 @@ except ImportError:
import html5lib
from . import XMLParser
-from .item import (ManifestItem, ManualTest, WebDriverSpecTest, RefTestNode, TestharnessTest,
+from .item import (ManifestItem, ManualTest, WebDriverSpecTest, RefTest, TestharnessTest,
SupportFile, CrashTest, ConformanceCheckerTest, VisualTest)
from .utils import ContextManagerBytesIO, cached_property
@@ -923,8 +923,8 @@ class SourceFile(object):
))
elif self.content_is_ref_node:
- rv = RefTestNode.item_type, [
- RefTestNode(
+ rv = RefTest.item_type, [
+ RefTest(
self.tests_root,
self.rel_path,
self.url_base,
diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py b/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
index 733cafdcbe9..e9f2f0e13ed 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
@@ -49,7 +49,7 @@ def rel_dir_file_path(draw):
@hs.composite
def sourcefile_strategy(draw):
- item_classes = [item.TestharnessTest, item.RefTestNode,
+ item_classes = [item.TestharnessTest, item.RefTest,
item.ManualTest, item.WebDriverSpecTest,
item.ConformanceCheckerTest, item.SupportFile]
cls = draw(hs.sampled_from(item_classes))
@@ -58,7 +58,7 @@ def sourcefile_strategy(draw):
hash = draw(hs.text(alphabet="0123456789abcdef", min_size=40, max_size=40))
s = mock.Mock(rel_path=path, hash=hash)
- if cls is item.RefTestNode:
+ if cls is item.RefTest:
ref_path = draw(rel_dir_file_path())
h.assume(path != ref_path)
ref_eq = draw(hs.sampled_from(["==", "!="]))
@@ -91,7 +91,7 @@ def test_manifest_to_json(s):
@h.given(hs.lists(sourcefile_strategy(),
min_size=1, unique_by=lambda x: x.rel_path))
@h.example([SourceFileWithTest("a", "0"*40, item.TestharnessTest)])
-@h.example([SourceFileWithTest("a", "0"*40, item.RefTestNode, references=[("/aa", "==")])])
+@h.example([SourceFileWithTest("a", "0"*40, item.RefTest, references=[("/aa", "==")])])
def test_manifest_idempotent(s):
m = manifest.Manifest()
@@ -168,130 +168,22 @@ def test_manifest_from_json_backslash():
def test_reftest_computation_chain():
m = manifest.Manifest()
- s1 = SourceFileWithTest("test1", "0"*40, item.RefTestNode, references=[("/test2", "==")])
- s2 = SourceFileWithTest("test2", "0"*40, item.RefTestNode, references=[("/test3", "==")])
+ s1 = SourceFileWithTest("test1", "0"*40, item.RefTest, references=[("/test2", "==")])
+ s2 = SourceFileWithTest("test2", "0"*40, item.RefTest, references=[("/test3", "==")])
m.update([(s1, True), (s2, True)])
test1 = s1.manifest_items()[1][0]
test2 = s2.manifest_items()[1][0]
- assert list(m) == [("reftest", test1.path, {test1.to_RefTest()}),
- ("reftest_node", test2.path, {test2})]
-
-
-def test_reftest_computation_chain_update_add():
- m = manifest.Manifest()
-
- s2 = SourceFileWithTest("test2", "0"*40, item.RefTestNode, references=[("/test3", "==")])
- test2 = s2.manifest_items()[1][0]
-
- assert m.update([(s2, True)]) is True
-
- assert list(m) == [("reftest", test2.path, {test2.to_RefTest()})]
-
- s1 = SourceFileWithTest("test1", "0"*40, item.RefTestNode, references=[("/test2", "==")])
- test1 = s1.manifest_items()[1][0]
-
- # s2's hash is unchanged, but it has gone from a test to a node
- assert m.update([(s1, True), (s2, True)]) is True
-
- assert list(m) == [("reftest", test1.path, {test1.to_RefTest()}),
- ("reftest_node", test2.path, {test2})]
-
-
-def test_reftest_computation_chain_update_remove():
- m = manifest.Manifest()
-
- s1 = SourceFileWithTest("test1", "0"*40, item.RefTestNode, references=[("/test2", "==")])
- s2 = SourceFileWithTest("test2", "0"*40, item.RefTestNode, references=[("/test3", "==")])
-
- assert m.update([(s1, True), (s2, True)]) is True
-
- test1 = s1.manifest_items()[1][0]
- test2 = s2.manifest_items()[1][0]
-
- assert list(m) == [("reftest", test1.path, {test1.to_RefTest()}),
- ("reftest_node", test2.path, {test2})]
-
- # s2's hash is unchanged, but it has gone from a node to a test
- assert m.update([(s2, True)]) is True
-
- assert list(m) == [("reftest", test2.path, {test2.to_RefTest()})]
-
-
-def test_reftest_computation_chain_update_test_type():
- m = manifest.Manifest()
-
- s1 = SourceFileWithTest("test", "0"*40, item.RefTestNode, references=[("/test-ref", "==")])
-
- assert m.update([(s1, True)]) is True
-
- test1 = s1.manifest_items()[1][0]
-
- assert list(m) == [("reftest", test1.path, {test1.to_RefTest()})]
-
- # test becomes a testharness test (hash change because that is determined
- # based on the file contents). The updated manifest should not includes the
- # old reftest.
- s2 = SourceFileWithTest("test", "1"*40, item.TestharnessTest)
- assert m.update([(s2, True)]) is True
-
- test2 = s2.manifest_items()[1][0]
-
- assert list(m) == [("testharness", test2.path, {test2})]
-
-
-def test_reftest_computation_chain_update_node_change():
- m = manifest.Manifest()
-
- s1 = SourceFileWithTest("test1", "0"*40, item.RefTestNode, references=[("/test2", "==")])
- s2 = SourceFileWithTest("test2", "0"*40, item.RefTestNode, references=[("/test3", "==")])
-
- assert m.update([(s1, True), (s2, True)]) is True
-
- test1 = s1.manifest_items()[1][0]
- test2 = s2.manifest_items()[1][0]
-
- assert list(m) == [("reftest", test1.path, {test1.to_RefTest()}),
- ("reftest_node", test2.path, {test2})]
-
- #test2 changes to support type
- s2 = SourceFileWithTest("test2", "1"*40, item.SupportFile)
-
- assert m.update([(s1, True), (s2, True)]) is True
- test3 = s2.manifest_items()[1][0]
-
- assert list(m) == [("reftest", test1.path, {test1.to_RefTest()}),
- ("support", test3.path, {test3})]
-
-
-def test_reftest_computation_chain_update_node_change_partial():
- m = manifest.Manifest()
-
- s1 = SourceFileWithTest("test1", "0"*40, item.RefTestNode, references=[("/test2", "==")])
- s2 = SourceFileWithTest("test2", "0"*40, item.RefTestNode, references=[("/test3", "==")])
-
- assert m.update([(s1, True), (s2, True)]) is True
-
- test1 = s1.manifest_items()[1][0]
- test2 = s2.manifest_items()[1][0]
-
- assert list(m) == [("reftest", test1.path, {test1.to_RefTest()}),
- ("reftest_node", test2.path, {test2})]
-
- s2 = SourceFileWithTest("test2", "1"*40, item.RefTestNode, references=[("/test3", "==")])
-
- assert m.update([(s1.rel_path, False), (s2, True)]) is True
-
- assert list(m) == [("reftest", test1.path, {test1.to_RefTest()}),
- ("reftest_node", test2.path, {test2})]
+ assert list(m) == [("reftest", test1.path, {test1}),
+ ("reftest", test2.path, {test2})]
def test_iterpath():
m = manifest.Manifest()
- sources = [SourceFileWithTest("test1", "0"*40, item.RefTestNode, references=[("/test1-ref", "==")]),
+ sources = [SourceFileWithTest("test1", "0"*40, item.RefTest, references=[("/test1-ref", "==")]),
SourceFileWithTests("test2", "1"*40, item.TestharnessTest, [("test2-1.html", {}),
("test2-2.html", {})]),
SourceFileWithTest("test3", "0"*40, item.TestharnessTest)]
@@ -302,24 +194,6 @@ def test_iterpath():
assert set(m.iterpath("missing")) == set()
-def test_reftest_node_by_url():
- m = manifest.Manifest()
-
- s1 = SourceFileWithTest("test1", "0"*40, item.RefTestNode, references=[("/test2", "==")])
- s2 = SourceFileWithTest("test2", "0"*40, item.RefTestNode, references=[("/test3", "==")])
-
- m.update([(s1, True), (s2, True)])
-
- test1 = s1.manifest_items()[1][0]
- test2 = s2.manifest_items()[1][0]
-
- assert m.reftest_nodes_by_url == {"/test1": test1.to_RefTest(),
- "/test2": test2}
- m._reftest_nodes_by_url = None
- assert m.reftest_nodes_by_url == {"/test1": test1.to_RefTest(),
- "/test2": test2}
-
-
def test_no_update():
m = manifest.Manifest()
diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
index 0a7a1ca0b41..1200ce59a26 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
@@ -657,7 +657,7 @@ def test_relative_testdriver(ext):
@pytest.mark.parametrize("ext", ["htm", "html"])
-def test_reftest_node(ext):
+def test_reftest(ext):
content = b"
"
filename = "foo/test." + ext
@@ -673,7 +673,7 @@ def test_reftest_node(ext):
assert s.content_is_ref_node
- assert items(s) == [("reftest_node", "/" + filename)]
+ assert items(s) == [("reftest", "/" + filename)]
@pytest.mark.parametrize("ext", ["xht", "html", "xhtml", "htm", "xml", "svg"])
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py
index 5d900a3d6c9..5f199390b64 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py
@@ -29,7 +29,6 @@ def SourceFileWithTest(path, hash, cls, *args):
item_classes = {"testharness": manifest_item.TestharnessTest,
"reftest": manifest_item.RefTest,
- "reftest_node": manifest_item.RefTestNode,
"manual": manifest_item.ManualTest,
"wdspec": manifest_item.WebDriverSpecTest,
"conformancechecker": manifest_item.ConformanceCheckerTest,
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
index 1d14f4efeea..67b57583424 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
@@ -423,6 +423,17 @@ class ManualTest(Test):
class ReftestTest(Test):
+ """A reftest
+
+ A reftest should be considered to pass if one of its references matches (see below) *and* the
+ reference passes if it has any references recursively.
+
+ Attributes:
+ references (List[Tuple[str, str]]): a list of alternate references, where one must match for the test to pass
+ viewport_size (Optional[Tuple[int, int]]): size of the viewport for this test, if not default
+ dpi (Optional[int]): dpi to use when rendering this test, if not default
+
+ """
result_cls = ReftestResult
test_type = "reftest"
@@ -445,17 +456,10 @@ class ReftestTest(Test):
manifest_file,
manifest_test,
inherit_metadata,
- test_metadata,
- nodes=None,
- references_seen=None):
+ test_metadata):
timeout = cls.long_timeout if manifest_test.timeout == "long" else cls.default_timeout
- if nodes is None:
- nodes = {}
- if references_seen is None:
- references_seen = set()
-
url = manifest_test.url
node = cls(manifest_file.tests_root,
@@ -470,38 +474,56 @@ class ReftestTest(Test):
protocol="https" if hasattr(manifest_test, "https") and manifest_test.https else "http",
fuzzy=manifest_test.fuzzy)
- nodes[url] = node
+ refs_by_type = defaultdict(list)
for ref_url, ref_type in manifest_test.references:
- comparison_key = (ref_type,) + tuple(sorted([url, ref_url]))
- if ref_url in nodes:
- manifest_node = ref_url
- if comparison_key in references_seen:
- # We have reached a cycle so stop here
- # Note that just seeing a node for the second time is not
- # enough to detect a cycle because
- # A != B != C != A must include C != A
- # but A == B == A should not include the redundant B == A.
- continue
+ refs_by_type[ref_type].append(ref_url)
- references_seen.add(comparison_key)
-
- manifest_node = manifest_file.get_reference(ref_url)
- if manifest_node:
- reference = ReftestTest.from_manifest(manifest_file,
- manifest_node,
- [],
- None,
- nodes,
- references_seen)
- else:
- reference = ReftestTest(manifest_file.tests_root,
- ref_url,
+ # Construct a list of all the mismatches, where we end up with mismatch_1 != url !=
+ # mismatch_2 != url != mismatch_3 etc.
+ #
+ # Per the logic documented above, this means that none of the mismatches provided match,
+ mismatch_walk = None
+ if refs_by_type["!="]:
+ mismatch_walk = ReftestTest(manifest_file.tests_root,
+ refs_by_type["!="][0],
[],
None,
[])
+ cmp_ref = mismatch_walk
+ for ref_url in refs_by_type["!="][1:]:
+ cmp_self = ReftestTest(manifest_file.tests_root,
+ url,
+ [],
+ None,
+ [])
+ cmp_ref.references.append((cmp_self, "!="))
+ cmp_ref = ReftestTest(manifest_file.tests_root,
+ ref_url,
+ [],
+ None,
+ [])
+ cmp_self.references.append((cmp_ref, "!="))
- node.references.append((reference, ref_type))
+ if mismatch_walk is None:
+ mismatch_refs = []
+ else:
+ mismatch_refs = [(mismatch_walk, "!=")]
+
+ if refs_by_type["=="]:
+ # For each == ref, add a reference to this node whose tail is the mismatch list.
+ # Per the logic documented above, this means any one of the matches must pass plus all the mismatches.
+ for ref_url in refs_by_type["=="]:
+ ref = ReftestTest(manifest_file.tests_root,
+ ref_url,
+ [],
+ None,
+ mismatch_refs)
+ node.references.append((ref, "=="))
+ else:
+ # Otherwise, we just add the mismatches directly as we are immediately into the
+ # mismatch chain with no alternates.
+ node.references.extend(mismatch_refs)
return node
diff --git a/tests/wpt/web-platform-tests/webgpu/cts.html b/tests/wpt/web-platform-tests/webgpu/cts.html
index 13d8b7c8324..6099f7318f1 100644
--- a/tests/wpt/web-platform-tests/webgpu/cts.html
+++ b/tests/wpt/web-platform-tests/webgpu/cts.html
@@ -68,6 +68,7 @@
+
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/util/index.js b/tests/wpt/web-platform-tests/webgpu/framework/util/index.js
index 32aea98dea7..01d10e375b6 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/util/index.js
+++ b/tests/wpt/web-platform-tests/webgpu/framework/util/index.js
@@ -16,6 +16,9 @@ export function rejectOnTimeout(ms, msg) {
}, ms);
});
}
+export function raceWithRejectOnTimeout(p, ms, msg) {
+ return Promise.race([p, rejectOnTimeout(ms, msg)]);
+}
export function objectEquals(x, y) {
if (typeof x !== 'object' || typeof y !== 'object') return x === y;
if (x === null || y === null) return x === y;
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/version.js b/tests/wpt/web-platform-tests/webgpu/framework/version.js
index e2c91190305..9d1c0810c9d 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/version.js
+++ b/tests/wpt/web-platform-tests/webgpu/framework/version.js
@@ -1,3 +1,3 @@
// AUTO-GENERATED - DO NOT EDIT. See tools/gen_version.
-export const version = 'e114192747a54f34157eb65754e037701fbdf98b';
+export const version = '70754155a0bca2c24e3e3c249bab9ee3dd765a26';
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/create_mapped.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/create_mapped.spec.js
index 4a727008b8c..0231c95dab2 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/create_mapped.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/create_mapped.spec.js
@@ -15,13 +15,4 @@ g.test('createBufferMapped', async t => {
t.checkMapWrite(buffer, arrayBuffer, size);
}).params(pcombine(poptions('size', [12, 512 * 1024]), //
pbool('mappable')));
-g.test('createBufferMappedAsync', async t => {
- const size = t.params.size;
- const [buffer, arrayBuffer] = await t.device.createBufferMappedAsync({
- size,
- usage: GPUBufferUsage.COPY_SRC | (t.params.mappable ? GPUBufferUsage.MAP_WRITE : 0)
- });
- t.checkMapWrite(buffer, arrayBuffer, size);
-}).params(pcombine(poptions('size', [12, 512 * 1024]), //
-pbool('mappable')));
//# sourceMappingURL=create_mapped.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map.spec.js
index 3794573c83c..ecbe7f9c340 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map.spec.js
@@ -41,13 +41,4 @@ g.test('createBufferMapped', async t => {
t.checkMapWrite(buffer, arrayBuffer, size);
}).params(pcombine(poptions('size', [12, 512 * 1024]), //
pbool('mappable')));
-g.test('createBufferMappedAsync', async t => {
- const size = t.params.size;
- const [buffer, arrayBuffer] = await t.device.createBufferMappedAsync({
- size,
- usage: GPUBufferUsage.COPY_SRC | (t.params.mappable ? GPUBufferUsage.MAP_WRITE : 0)
- });
- t.checkMapWrite(buffer, arrayBuffer, size);
-}).params(pcombine(poptions('size', [12, 512 * 1024]), //
-pbool('mappable')));
//# sourceMappingURL=map.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_detach.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_detach.spec.js
index c8bd2dc68e5..9174efca59c 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_detach.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_detach.spec.js
@@ -3,7 +3,7 @@
**/
export const description = ``;
-import { TestGroup, pbool, pcombine } from '../../../framework/index.js';
+import { TestGroup } from '../../../framework/index.js';
import { GPUTest } from '../gpu_test.js';
class F extends GPUTest {
@@ -61,7 +61,7 @@ g.test('create mapped', async t => {
size: 4,
usage: GPUBufferUsage.MAP_WRITE
};
- const [buffer, arrayBuffer] = t.params.async ? await t.device.createBufferMappedAsync(desc) : t.device.createBufferMapped(desc);
+ const [buffer, arrayBuffer] = t.device.createBufferMapped(desc);
const view = new Uint8Array(arrayBuffer);
t.expect(arrayBuffer.byteLength === 4);
t.expect(view.length === 4);
@@ -69,8 +69,7 @@ g.test('create mapped', async t => {
if (t.params.destroy) buffer.destroy();
t.expect(arrayBuffer.byteLength === 0, 'ArrayBuffer should be detached');
t.expect(view.byteLength === 0, 'ArrayBufferView should be detached');
-}).params(pcombine(pbool('async'), //
-[{
+}).params([{
unmap: true,
destroy: false
}, {
@@ -79,5 +78,5 @@ g.test('create mapped', async t => {
}, {
unmap: true,
destroy: true
-}]));
+}]);
//# sourceMappingURL=map_detach.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_oom.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_oom.spec.js
index db791cedd33..24adf67fd6a 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_oom.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_oom.spec.js
@@ -27,7 +27,4 @@ g.test('createBufferMapped', async t => {
t.device.createBufferMapped(getBufferDesc());
});
});
-g.test('createBufferAsync', async t => {
- t.shouldReject('RangeError', t.device.createBufferMappedAsync(getBufferDesc()));
-});
//# sourceMappingURL=map_oom.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/fences.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/fences.spec.js
index ccf513633da..af6482fcab5 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/fences.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/fences.spec.js
@@ -4,7 +4,7 @@
export const description = ``;
import { attemptGarbageCollection } from '../../framework/collect_garbage.js';
-import { TestGroup } from '../../framework/index.js';
+import { TestGroup, raceWithRejectOnTimeout } from '../../framework/index.js';
import { GPUTest } from './gpu_test.js';
export const g = new TestGroup(GPUTest);
g.test('initial/no descriptor', t => {
@@ -96,6 +96,15 @@ g.test('wait/many/parallel', async t => {
await Promise.all(promises);
t.expect(fence.getCompletedValue() === 20);
+}); // Test onCompletion promise resolves within a time limit.
+
+g.test('wait/resolves within timeout', t => {
+ const fence = t.queue.createFence();
+ t.queue.signal(fence, 2);
+ return raceWithRejectOnTimeout((async () => {
+ await fence.onCompletion(2);
+ t.expect(fence.getCompletedValue() === 2);
+ })(), 100, 'The fence has not been resolved within time limit.');
}); // Test dropping references to the fence and onCompletion promise does not crash.
g.test('drop/fence and promise', t => {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/index.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/index.js
index d38bcc5b6b5..9fb8395d5b5 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/index.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/index.js
@@ -61,6 +61,10 @@ export const listing = [
"path": "fences",
"description": ""
},
+ {
+ "path": "resource_init/sampled_texture_clear",
+ "description": "computePass test that sampled texture is cleared"
+ },
{
"path": "validation/createBindGroup",
"description": "createBindGroup validation tests."
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js
new file mode 100644
index 00000000000..b7dfbe3583f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js
@@ -0,0 +1,98 @@
+/**
+* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
+**/
+
+export const description = `
+computePass test that sampled texture is cleared`;
+import { TestGroup } from '../../../framework/index.js';
+import { GPUTest } from '../gpu_test.js';
+export const g = new TestGroup(GPUTest);
+g.test('compute pass test that sampled texture is cleared', async t => {
+ const texture = t.device.createTexture({
+ size: {
+ width: 256,
+ height: 256,
+ depth: 1
+ },
+ format: 'r8unorm',
+ usage: GPUTextureUsage.SAMPLED
+ });
+ const bufferTex = t.device.createBuffer({
+ size: 4 * 256 * 256,
+ usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST
+ });
+ const sampler = t.device.createSampler();
+ const bindGroupLayout = t.device.createBindGroupLayout({
+ bindings: [{
+ binding: 0,
+ visibility: GPUShaderStage.COMPUTE,
+ type: 'sampled-texture'
+ }, {
+ binding: 1,
+ visibility: GPUShaderStage.COMPUTE,
+ type: 'storage-buffer'
+ }, {
+ binding: 2,
+ visibility: GPUShaderStage.COMPUTE,
+ type: 'sampler'
+ }]
+ }); // create compute pipeline
+
+ const computeModule = t.device.createShaderModule({
+ code:
+ /* GLSL(
+ * 'compute',
+ * `#version 450
+ * layout(binding = 0) uniform texture2D sampleTex;
+ * layout(std430, binding = 1) buffer BufferTex {
+ * vec4 result;
+ * } bufferTex;
+ * layout(binding = 2) uniform sampler sampler0;
+ * void main() {
+ * bufferTex.result =
+ * texelFetch(sampler2D(sampleTex, sampler0), ivec2(0,0), 0);
+ * }`
+ * )
+ */
+ new Uint32Array([119734787, 66304, 524295, 29, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 327695, 5, 4, 1852399981, 0, 393232, 4, 17, 1, 1, 1, 196611, 2, 450, 262149, 4, 1852399981, 0, 327685, 8, 1717990722, 1700033125, 120, 327686, 8, 0, 1970496882, 29804, 327685, 10, 1717990754, 1700033125, 120, 327685, 15, 1886216563, 1700029804, 120, 327685, 19, 1886216563, 812803436, 0, 327752, 8, 0, 35, 0, 196679, 8, 2, 262215, 10, 34, 0, 262215, 10, 33, 1, 262215, 15, 34, 0, 262215, 15, 33, 0, 262215, 19, 34, 0, 262215, 19, 33, 2, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 196638, 8, 7, 262176, 9, 12, 8, 262203, 9, 10, 12, 262165, 11, 32, 1, 262187, 11, 12, 0, 589849, 13, 6, 1, 0, 0, 0, 1, 0, 262176, 14, 0, 13, 262203, 14, 15, 0, 131098, 17, 262176, 18, 0, 17, 262203, 18, 19, 0, 196635, 21, 13, 262167, 23, 11, 2, 327724, 23, 24, 12, 12, 262176, 27, 12, 7, 327734, 2, 4, 0, 3, 131320, 5, 262205, 13, 16, 15, 262205, 17, 20, 19, 327766, 21, 22, 16, 20, 262244, 13, 25, 22, 458847, 7, 26, 25, 24, 2, 12, 327745, 27, 28, 10, 12, 196670, 28, 26, 65789, 65592])
+ });
+ const pipelineLayout = t.device.createPipelineLayout({
+ bindGroupLayouts: [bindGroupLayout]
+ });
+ const computePipeline = t.device.createComputePipeline({
+ computeStage: {
+ module: computeModule,
+ entryPoint: 'main'
+ },
+ layout: pipelineLayout
+ }); // create bindgroup
+
+ const bindGroup = t.device.createBindGroup({
+ layout: bindGroupLayout,
+ bindings: [{
+ binding: 0,
+ resource: texture.createView()
+ }, {
+ binding: 1,
+ resource: {
+ buffer: bufferTex,
+ offset: 0,
+ size: 4 * 256 * 256
+ }
+ }, {
+ binding: 2,
+ resource: sampler
+ }]
+ }); // encode the pass and submit
+
+ const encoder = t.device.createCommandEncoder();
+ const pass = encoder.beginComputePass();
+ pass.setPipeline(computePipeline);
+ pass.setBindGroup(0, bindGroup);
+ pass.dispatch(256, 256, 1);
+ pass.endPass();
+ const commands = encoder.finish();
+ t.device.defaultQueue.submit([commands]);
+ await t.expectContents(bufferTex, new Uint32Array([0]));
+});
+//# sourceMappingURL=sampled_texture_clear.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js
index 475d0835a0a..6c6cfd73ae0 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js
@@ -8,7 +8,7 @@ export const description = `
error scope validation tests.
`;
import { getGPU } from '../../../framework/gpu/implementation.js';
-import { Fixture, TestGroup, rejectOnTimeout } from '../../../framework/index.js';
+import { Fixture, TestGroup, raceWithRejectOnTimeout } from '../../../framework/index.js';
class F extends Fixture {
constructor(...args) {
@@ -51,7 +51,7 @@ class F extends Fixture {
});
});
fn();
- return Promise.race([promise, rejectOnTimeout(TIMEOUT_IN_MS, 'Timeout occurred waiting for uncaptured error')]);
+ return raceWithRejectOnTimeout(promise, TIMEOUT_IN_MS, 'Timeout occurred waiting for uncaptured error');
});
}
diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js b/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js
index dc60f6739d4..3d9bfa2082b 100644
--- a/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js
+++ b/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js
@@ -130,6 +130,7 @@ const ALL_FEATURES = [
const TRACKED_IMMERSIVE_DEVICE = {
supportsImmersive: true,
+ supportedModes: [ "inline", "immersive-vr"],
views: VALID_VIEWS,
viewerOrigin: IDENTITY_TRANSFORM,
supportedFeatures: ALL_FEATURES
@@ -137,6 +138,7 @@ const TRACKED_IMMERSIVE_DEVICE = {
const VALID_NON_IMMERSIVE_DEVICE = {
supportsImmersive: false,
+ supportedModes: ["inline"],
views: NON_IMMERSIVE_VIEWS,
viewerOrigin: IDENTITY_TRANSFORM,
supportedFeatures: ALL_FEATURES
@@ -154,4 +156,4 @@ const RIGHT_CONTROLLER = {
targetRayMode: "tracked-pointer",
pointerOrigin: VALID_POINTER_TRANSFORM,
profiles: []
-}
+};
diff --git a/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html b/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html
index 55d31159111..9043d59e3b2 100644
--- a/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html
@@ -12,6 +12,7 @@ let testName =
let fakeDeviceInitParams = {
supportsImmersive: true,
+ supportedModes: ["inline", "immersive-vr"],
views: VALID_VIEWS,
viewerOrigin: IDENTITY_TRANSFORM,
floorOrigin: VALID_FLOOR_ORIGIN,
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
index e7fe576cb20..988d99728d4 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
@@ -28,6 +28,7 @@ const VIEWS_WITH_OFFSET = [{
let fakeDeviceInitParams = {
supportsImmersive: true,
+ supportedModes: ["inline", "immersive-vr"],
viewerOrigin: VALID_POSE_TRANSFORM,
views: VIEWS_WITH_OFFSET,
supportedFeatures: ALL_FEATURES
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
index cfa3cc7ca2f..7ef880c32c0 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
@@ -34,6 +34,7 @@ const FLOOR_TRANSFORM = {
const fakeDeviceInitParams = {
supportsImmersive: true,
+ supportedModes: ["inline", "immersive-vr"],
views: VIEWS_WITH_OFFSET,
viewerOrigin: IDENTITY_TRANSFORM,
floorOrigin: FLOOR_TRANSFORM,
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html
index 2f93914e851..5cd0f027266 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html
@@ -11,6 +11,7 @@ let testName = "Creating XRReferenceSpace origin offset off of `viewer` space wo
let fakeDeviceInitParams = {
supportsImmersive: true,
+ supportedModes: ["inline", "immersive-vr"],
viewerOrigin: VALID_POSE_TRANSFORM,
views: VALID_VIEWS,
supportedFeatures: ALL_FEATURES
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_features_deviceSupport.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_features_deviceSupport.https.html
index 45a68c9df2f..d8858bd4be6 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_features_deviceSupport.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_features_deviceSupport.https.html
@@ -12,6 +12,7 @@
let fakeDeviceInitParams = {
supportsImmersive: true,
+ supportedModes: ["inline", "immersive-vr"],
views: VALID_VIEWS,
viewerOrigin: IDENTITY_TRANSFORM,
supportedFeatures: [
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
index 0b83b4c6bb1..1b54f5f6ec1 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
@@ -16,6 +16,7 @@
let fakeDeviceInitParams = {
supportsImmersive: true,
+ supportedModes: ["inline", "immersive-vr"],
views: VALID_VIEWS,
supportedFeatures: ALL_FEATURES
};
diff --git a/tests/wpt/web-platform-tests/webxr/xrView_match.https.html b/tests/wpt/web-platform-tests/webxr/xrView_match.https.html
index 9ccad9518b9..4bb48826ae0 100644
--- a/tests/wpt/web-platform-tests/webxr/xrView_match.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrView_match.https.html
@@ -25,6 +25,7 @@ const fakeViews = [{
let fakeDeviceInitParams = {
supportsImmersive: true,
+ supportedModes: ["inline", "immersive-vr"],
views: fakeViews,
viewerOrigin: IDENTITY_TRANSFORM,
supportedFeatures: ALL_FEATURES
diff --git a/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html b/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html
index 438d3dbaa36..6671721e4c5 100644
--- a/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html
@@ -32,6 +32,7 @@ const fakeViews = [{
let fakeDeviceInitParams = {
supportsImmersive: true,
+ supportedModes: ["inline", "immersive-vr"],
views: fakeViews,
viewerOrigin: IDENTITY_TRANSFORM,
supportedFeatures: ALL_FEATURES