+
+
diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-utils.js b/tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-utils.js
index 9c6ba77549b..7eb9e6327a2 100644
--- a/tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-utils.js
+++ b/tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-utils.js
@@ -126,7 +126,7 @@ function assertPopoverVisibility(popover, isPopover, expectedVisibility, message
} else {
assert_equals(window.getComputedStyle(popover).display,'none',`${message}: Non-showing popovers should have display:none`);
assert_false(popover.matches(':open'),`${message}: Non-showing popovers should *not* match :open`);
- assert_true(popover.matches(':closed'),`${message}: Non-showing popovers should match :closed`);
+ assert_equals(popover.matches(':closed'),isPopover,`${message}: Non-showing popovers should match :closed`);
}
}
diff --git a/tests/wpt/web-platform-tests/images/cicp.png b/tests/wpt/web-platform-tests/images/cicp.png
new file mode 100644
index 00000000000..8fa0ce2123c
Binary files /dev/null and b/tests/wpt/web-platform-tests/images/cicp.png differ
diff --git a/tests/wpt/web-platform-tests/images/trns.png b/tests/wpt/web-platform-tests/images/trns.png
new file mode 100644
index 00000000000..4e309a89a8a
Binary files /dev/null and b/tests/wpt/web-platform-tests/images/trns.png differ
diff --git a/tests/wpt/web-platform-tests/inert/inert-computed-style.html b/tests/wpt/web-platform-tests/inert/inert-computed-style.html
index 3c1748de2b4..f1adbab6b7a 100644
--- a/tests/wpt/web-platform-tests/inert/inert-computed-style.html
+++ b/tests/wpt/web-platform-tests/inert/inert-computed-style.html
@@ -15,11 +15,11 @@
left: 0;
background-color: blue;
}
- #non-inert {
+ #nonInert {
background-color: red;
}
-
+
+
+
+
+
+
+
+
+
Long Animation Frame: queue time
+
+
+
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-event-listener.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-event-listener.html
new file mode 100644
index 00000000000..6349c28b320
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-event-listener.html
@@ -0,0 +1,33 @@
+
+
+
Long Animation Frame Timing: basic
+
+
+
+
+
+
+
Long Animation Frame: event handlers
+
+
+
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-idle.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-idle.html
new file mode 100644
index 00000000000..bc9f910bb14
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-idle.html
@@ -0,0 +1,36 @@
+
+
+
Long Animation Frame Timing: requestIdleCallback
+
+
+
+
+
+
+
Long Animation Frame: requestIdleCallback
+
+
+
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html
index 83def572998..565273b6c6a 100644
--- a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html
@@ -15,7 +15,7 @@ const host_info = get_host_info();
const {ORIGIN, REMOTE_ORIGIN, HTTP_NOTSAMESITE_ORIGIN} = host_info;
promise_test(async t => {
- const executor = await prepare_exec_iframe(t, ORIGIN);
+ const [executor] = await prepare_exec_iframe(t, ORIGIN);
await expect_no_long_frame(() => executor.execute_script((duration) => {
const deadline = performance.now() + duration;
while (performance.now() < deadline) {}
@@ -23,7 +23,7 @@ promise_test(async t => {
}, 'A long busy wait without render in a same-origin iframe is not a long animation frame');
promise_test(async t => {
- const executor = await prepare_exec_iframe(t, HTTP_NOTSAMESITE_ORIGIN);
+ const [executor] = await prepare_exec_iframe(t, HTTP_NOTSAMESITE_ORIGIN);
await expect_no_long_frame(() => executor.execute_script((duration) => {
const deadline = performance.now() + duration;
while (performance.now() < deadline) {}
@@ -31,7 +31,7 @@ promise_test(async t => {
}, 'A long busy wait in a cross-origin iframe is not a long animation frame');
promise_test(async t => {
- const executor = await prepare_exec_iframe(t, ORIGIN);
+ const [executor] = await prepare_exec_iframe(t, ORIGIN);
await expect_long_frame(() => executor.execute_script(async (duration) => {
await new Promise(resolve => window.requestAnimationFrame(resolve));
const deadline = performance.now() + duration;
@@ -40,7 +40,7 @@ promise_test(async t => {
}, 'A long busy wait in a same-origin requestAnimationFrame is a long animation frame');
promise_test(async t => {
- const executor = await prepare_exec_popup(t, ORIGIN);
+ const [executor] = await prepare_exec_popup(t, ORIGIN);
await expect_no_long_frame(() => executor.execute_script((duration) => {
const deadline = performance.now() + duration;
while (performance.now() < deadline) {}
@@ -49,7 +49,7 @@ promise_test(async t => {
for (const origin of ["ORIGIN", "REMOTE_ORIGIN", "HTTP_NOTSAMESITE_ORIGIN"]) {
promise_test(async t => {
- const executor = await prepare_exec_iframe(t, host_info[origin]);
+ const [executor] = await prepare_exec_iframe(t, host_info[origin]);
const entry = await executor.execute_script(async (duration) => {
const entryPromise = new Promise(resolve => new PerformanceObserver(list => {
resolve(list.getEntries(0));
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-promise.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-promise.html
new file mode 100644
index 00000000000..226d06a8303
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-promise.html
@@ -0,0 +1,52 @@
+
+
+
Long Animation Frame Timing: basic
+
+
+
+
+
+
+
+
Long Animation Frame: promise resolvers
+
+
+
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-block.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-block.html
new file mode 100644
index 00000000000..f896a737ce7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-block.html
@@ -0,0 +1,47 @@
+
+
+
Long Animation Frame Timing: basic
+
+
+
+
+
+
+
Long Animation Frame: script blocks
+
+
+
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-window-attribution.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-window-attribution.html
new file mode 100644
index 00000000000..001bb537f79
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-window-attribution.html
@@ -0,0 +1,62 @@
+
+
+
+
Long Animation Frame Timing: window attribution
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-supportedEntryTypes.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-supportedEntryTypes.html
new file mode 100644
index 00000000000..efa01481fa1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-supportedEntryTypes.html
@@ -0,0 +1,22 @@
+
+
+
Long Animation Frame Timing: supportedEntryTypes
+
+
+
+
+
+
Long Animation Frame: supportedEntryTypes
+
+
+
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-user-callback.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-user-callback.html
new file mode 100644
index 00000000000..bc8fdd05e10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-user-callback.html
@@ -0,0 +1,52 @@
+
+
+
Long Animation Frame Timing: basic
+
+
+
+
+
+
+
Long Animation Frame: user callbacks
+
+
+
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-window-only.worker.js b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-window-only.worker.js
new file mode 100644
index 00000000000..c1f0439c4bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-window-only.worker.js
@@ -0,0 +1,11 @@
+importScripts("/resources/testharness.js");
+
+test(() => {
+ assert_false(PerformanceObserver.supportedEntryTypes.includes("long-animation-frame"));
+}, 'PerformanceObserver should not include "long-animation-frame" in workers');
+
+test(() => {
+ assert_false("PerformanceLongAnimationFrameTiming" in self);
+}, 'PerformanceLongAnimationFrameTiming should not be exposed in workers');
+
+done();
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/busy.js b/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/busy.js
new file mode 100644
index 00000000000..9d761b6de5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/busy.js
@@ -0,0 +1,4 @@
+(() => {
+ const deadline = performance.now() + 360;
+ while (performance.now() < deadline) {}
+})();
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/utils.js b/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/utils.js
index 47c138b1e62..3a121a5a9b5 100644
--- a/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/utils.js
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/utils.js
@@ -5,14 +5,18 @@ setup(() =>
const very_long_frame_duration = 360;
-function loaf_promise() {
+function loaf_promise(t) {
return new Promise(resolve => {
const observer = new PerformanceObserver(entries => {
const entry = entries.getEntries()[0];
- if (entry.duration >= very_long_frame_duration)
+ if (entry.duration >= very_long_frame_duration) {
+ observer.disconnect();
resolve(entry);
+ }
});
+ t.add_cleanup(() => observer.disconnect());
+
observer.observe({entryTypes: ['long-animation-frame']});
});
}
@@ -28,9 +32,9 @@ async function expect_long_frame(cb, t) {
await windowLoaded;
await new Promise(resolve => t.step_timeout(resolve, 0));
const timeout = new Promise((resolve, reject) =>
- t.step_timeout(() => reject("timeout"), no_long_frame_timeout));
- const receivedLongFrame = loaf_promise();
- await cb();
+ t.step_timeout(() => resolve("timeout"), no_long_frame_timeout));
+ const receivedLongFrame = loaf_promise(t);
+ await cb(t);
const entry = await Promise.race([
receivedLongFrame,
timeout
@@ -38,10 +42,24 @@ async function expect_long_frame(cb, t) {
return entry;
}
+async function expect_long_frame_with_script(cb, predicate, t) {
+ for (let i = 0; i < 10; ++i) {
+ const entry = await expect_long_frame(cb, t);
+ if (entry === "timeout" || !entry.scripts.length)
+ continue;
+ for (const script of entry.scripts) {
+ if (predicate(script))
+ return [entry, script];
+ }
+ }
+
+ return [];
+}
+
async function expect_no_long_frame(cb, t) {
await windowLoaded;
for (let i = 0; i < 5; ++i) {
- const receivedLongFrame = loaf_promise();
+ const receivedLongFrame = loaf_promise(t);
await cb();
const result = await Promise.race([receivedLongFrame,
new Promise(resolve => t.step_timeout(() => resolve("timeout"),
@@ -62,7 +80,7 @@ async function prepare_exec_iframe(t, origin) {
iframe.src = url.href;
document.body.appendChild(iframe);
await new Promise(resolve => iframe.addEventListener("load", resolve));
- return new RemoteContext(uuid);
+ return [new RemoteContext(uuid), iframe];
}
@@ -72,5 +90,38 @@ async function prepare_exec_popup(t, origin) {
url.searchParams.set("uuid", uuid);
const popup = window.open(url);
t.add_cleanup(() => popup.close());
- return new RemoteContext(uuid);
+ return [new RemoteContext(uuid), popup];
+}
+function test_loaf_script(cb, name, type, label) {
+ promise_test(async t => {
+ const [entry, script] = await expect_long_frame_with_script(cb,
+ script => (script.type === type && script.duration >= very_long_frame_duration), t);
+
+ assert_true(!!entry, "Entry detected");
+ assert_equals(script.name, name);
+ assert_greater_than_equal(script.duration, very_long_frame_duration);
+ assert_greater_than_equal(entry.duration, script.duration);
+ assert_greater_than_equal(script.executionStart, script.startTime);
+ assert_greater_than_equal(script.startTime, entry.startTime)
+ assert_equals(script.window, window);
+ assert_equals(script.forcedStyleAndLayoutDuration, 0);
+ assert_equals(script.windowAttribution, "self");
+}, `LoAF script: ${name} ${type},${label ? ` ${label}` : ''}`);
+
+}
+
+function test_self_user_callback(cb, name) {
+ test_loaf_script(cb, name, "user-callback");
+}
+
+function test_self_event_listener(cb, name) {
+ test_loaf_script(cb, name, "event-listener");
+}
+
+function test_promise_script(cb, resolve_or_reject, name, label) {
+ test_loaf_script(cb, name, `${resolve_or_reject}-promise`, label);
+}
+
+function test_self_script_block(cb, name, type) {
+ test_loaf_script(cb, name, type);
}
diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html
index d65f8928186..169843a7423 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html
+++ b/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html
@@ -1,46 +1,52 @@
-
-
LongTask Timing: long task in rAF
+
+
+
LongTask Timing: long task in rAF
+
+
+
+
+
Long Task: requestAnimationFrame
+
+
-
-
+ let entries = await new Promise(resolve => {
+ new PerformanceObserver(
+ entryList => {
+ const entries = entryList.getEntries().filter(
+ e => e.name == 'self' && e.attribution[0].containerType == 'window');
+ if (entries) {
+ resolve(entries);
+ }
+ }).observe({ entryTypes: ['longtask'] });
-
Long Task: requestAnimationFrame
-
-
+ });
+
+ assert_equals(entries.length, 1,
+ 'Exactly one entry is expected.');
+ const longtask = entries[0];
+ checkLongTaskEntry(longtask);
+ // Assert the TaskAttributionTiming entry in attribution.
+ assert_equals(longtask.attribution.length, 1,
+ 'Exactly one attribution entry is expected');
+ const attribution = longtask.attribution[0];
+ assert_equals(attribution.entryType, 'taskattribution');
+ assert_equals(attribution.name, 'unknown');
+ assert_equals(attribution.duration, 0);
+ assert_equals(attribution.startTime, 0);
+ assert_equals(attribution.containerType, 'window');
+ assert_equals(attribution.containerId, '');
+ assert_equals(attribution.containerName, '');
+ assert_equals(attribution.containerSrc, '');
+ }, 'Performance longtask entries are observable.');
+
diff --git a/tests/wpt/web-platform-tests/longtask-timing/resources/utils.js b/tests/wpt/web-platform-tests/longtask-timing/resources/utils.js
index 36bd6c7bc28..7bb37bab32c 100644
--- a/tests/wpt/web-platform-tests/longtask-timing/resources/utils.js
+++ b/tests/wpt/web-platform-tests/longtask-timing/resources/utils.js
@@ -1,11 +1,11 @@
-function checkLongTaskEntry(longtask, name='self') {
- assert_equals(longtask.entryType, 'longtask');
- assert_equals(longtask.name, name);
- assert_true(Number.isInteger(longtask.duration));
- assert_greater_than_equal(longtask.duration, 50);
- assert_greater_than_equal(longtask.startTime, 0);
+function checkLongTaskEntry(longtask, name = 'self') {
+ assert_equals(longtask.entryType, 'longtask', 'The entryType should be longtask');
+ assert_equals(longtask.name, name, 'Name should be ' + name + '.');
+ assert_true(Number.isInteger(longtask.duration, 'The duration should be an integer.'));
+ assert_greater_than_equal(longtask.duration, 50, 'The Duration should be greater than or equal to 50.');
+ assert_greater_than_equal(longtask.startTime, 0, 'The startTime should be greater than or equal to 0.');
const currentTime = performance.now();
- assert_less_than_equal(longtask.startTime, currentTime);
+ assert_less_than_equal(longtask.startTime, currentTime, 'The startTime should be less than or equal to current time.');
}
function hasUnrelatedTaskName(taskName, expectedTaskName) {
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html
index a1495dcb0c7..84efe52e06b 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html
@@ -57,10 +57,11 @@
"Should have gotten expected events");
}, "MediaRecorder handles pause() and resume() calls appropriately in state and events");
- promise_test(async () => {
- let video = createVideoStream();
- let recorder = new MediaRecorder(video);
- let events = recordEvents(recorder,
+ promise_test(async t => {
+ const {stream: video, control} = createVideoStream(t);
+ control.addVideoFrame();
+ const recorder = new MediaRecorder(video);
+ const events = recordEvents(recorder,
["start", "stop", "dataavailable", "pause", "resume", "error"]);
recorder.start();
diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html b/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html
index d68b11fa7cc..463746e8f79 100644
--- a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html
+++ b/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html
@@ -27,12 +27,9 @@ promise_test(async t => {
assert_equals(e.filename, location.href);
top_navigateerror_fired = true;
});
- let iframe_navigateerror_fired = false;
- i.contentWindow.navigation.onnavigateerror = t.step_func(e => {
- assert_equals(e.constructor, i.contentWindow.ErrorEvent);
- assert_equals(e.filename, i.contentWindow.location.href);
- iframe_navigateerror_fired = true;
- });
+
+ i.contentWindow.navigation.onnavigate = t.unreached_func("navigate event should not fire in the iframe, because the traversal was cancelled in the top window");
+ i.contentWindow.navigation.onnavigateerror = t.unreached_func("navigateerror event should not fire in the iframe, because the navigate event was not fired");
// When the top window blocks the traversal, it should be blocked in the
// iframe as well, and the traversal promises in the iframe should be rejected.
@@ -40,7 +37,6 @@ promise_test(async t => {
const iDOMException = iWindow.DOMException;
await assertBothRejectDOM(t, i.contentWindow.navigation.traverseTo(i.contentWindow.navigation.entries()[0].key), "AbortError", iWindow, iDOMException);
assert_true(top_navigateerror_fired);
- assert_true(iframe_navigateerror_fired);
assert_equals(navigation.currentEntry.index, 1);
assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
}, "navigation.traverseTo() in an iframe with same-document preventDefault in its parent");
diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document-before-navigate-event.html b/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document-before-navigate-event.html
new file mode 100644
index 00000000000..ed319f62239
--- /dev/null
+++ b/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document-before-navigate-event.html
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document-before-navigate-event.html b/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document-before-navigate-event.html
new file mode 100644
index 00000000000..592ac6f1990
--- /dev/null
+++ b/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document-before-navigate-event.html
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-parent.html b/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-parent.html
index bc3d4e2e9fb..6eee3f917cd 100644
--- a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-parent.html
+++ b/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-parent.html
@@ -29,6 +29,7 @@ promise_test(async t => {
await new Promise(resolve => window.onhashchange = resolve);
navigation.onnavigate = t.unreached_func("navigate must not fire");
+ navigation.onnavigateerror = t.unreached_func("navigateerror must not fire");
window.onpopstate = t.unreached_func("popstate must not fire");
window.onhashchange = t.unreached_func("hashchange must not fire");
diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-sibling.html b/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-sibling.html
index 718ea6d3dda..97c03ea0c2f 100644
--- a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-sibling.html
+++ b/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-sibling.html
@@ -33,6 +33,7 @@ promise_test(async t => {
await new Promise(resolve => i.onload = resolve);
i.contentWindow.navigation.onnavigate = t.unreached_func("navigate must not fire");
+ i.contentWindow.navigation.onnavigateerror = t.unreached_func("navigateerror must not fire");
i.contentWindow.onbeforeunload = t.unreached_func("beforeunload must not fire");
i.contentWindow.onunload = t.unreached_func("unload must not fire");
i.contentWindow.onpagehide = t.unreached_func("pagehide must not fire");
diff --git a/tests/wpt/web-platform-tests/png/META.yml b/tests/wpt/web-platform-tests/png/META.yml
new file mode 100644
index 00000000000..da174ac614d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/png/META.yml
@@ -0,0 +1,4 @@
+spec: https://www.w3.org/TR/png/
+suggested_reviewers:
+ - programmax
+ - svgeesus
diff --git a/tests/wpt/web-platform-tests/png/cicp-chunk.html b/tests/wpt/web-platform-tests/png/cicp-chunk.html
new file mode 100644
index 00000000000..4afc262dcf5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/png/cicp-chunk.html
@@ -0,0 +1,40 @@
+
+
PNG test: cICP chunk
+
+
+
+
+
+
+
cICP chunk
+
test pixel values of a display-p3 PNG
+
+
Actual output:
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/png/trns-chunk.html b/tests/wpt/web-platform-tests/png/trns-chunk.html
new file mode 100644
index 00000000000..652cda0e320
--- /dev/null
+++ b/tests/wpt/web-platform-tests/png/trns-chunk.html
@@ -0,0 +1,37 @@
+
+
PNG test: tRNS chunk
+
+
+
+
+
+
+
tRNS chunk handling
+
test ignored high bits on lower bit depth tRNS
+
+
Actual output:
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault-passive.html b/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault-passive.html
new file mode 100644
index 00000000000..57da0968660
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault-passive.html
@@ -0,0 +1,84 @@
+
+
Canceling passive pointerevents does not affect compat mouseevents
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/scroll-animations/crashtests/invalid-animation-range.html b/tests/wpt/web-platform-tests/scroll-animations/crashtests/invalid-animation-range.html
new file mode 100644
index 00000000000..43b23c93b60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/crashtests/invalid-animation-range.html
@@ -0,0 +1,13 @@
+
+
Invalid animation range
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html b/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
index 60d6c766467..87e66d0f532 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
@@ -40,4 +40,53 @@ test_shorthand_value('animation',
'animation-name': 'anim1, anim2, anim3',
'animation-timeline': 'auto, auto, auto'
});
+
+test((t) => {
+ t.add_cleanup(() => {
+ target.style = '';
+ });
+
+ target.style.animation = 'anim 1s';
+ target.style.animationTimeline = 'timeline';
+ assert_equals(target.style.animation, '');
+ assert_equals(target.style.animationName, 'anim');
+ assert_equals(target.style.animationDuration, '1s');
+}, 'Animation shorthand can not represent non-initial timelines (specified)');
+
+test((t) => {
+ t.add_cleanup(() => {
+ target.style = '';
+ });
+
+ target.style.animation = 'anim 1s';
+ target.style.animationTimeline = 'timeline';
+ assert_equals(getComputedStyle(target).animation, '');
+ assert_equals(getComputedStyle(target).animationName, 'anim');
+ assert_equals(getComputedStyle(target).animationDuration, '1s');
+}, 'Animation shorthand can not represent non-initial timelines (computed)');
+
+test((t) => {
+ t.add_cleanup(() => {
+ target.style = '';
+ });
+
+ target.style.animation = 'anim 1s';
+ target.style.animationDelayEnd = '42s';
+ assert_equals(target.style.animation, '');
+ assert_equals(target.style.animationName, 'anim');
+ assert_equals(target.style.animationDuration, '1s');
+}, 'Animation shorthand can not represent non-initial animation-delay-end (specified)');
+
+test((t) => {
+ t.add_cleanup(() => {
+ target.style = '';
+ });
+
+ target.style.animation = 'anim 1s';
+ target.style.animationDelayEnd = '42s';
+ assert_equals(getComputedStyle(target).animation, '');
+ assert_equals(getComputedStyle(target).animationName, 'anim');
+ assert_equals(getComputedStyle(target).animationDuration, '1s');
+}, 'Animation shorthand can not represent non-initial animation-delay-end (computed)');
+
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html
index 9f55e2d2c91..30461723386 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html
@@ -655,8 +655,25 @@ promise_test(async t => {
assert_equals(getComputedStyle(target).translate, '100px');
}, 'scroll-timeline-axis is vertical');
-// TODO: Add more tests which change scroll-timeline-axis property.
-// Those animations which use this timeline should be restyled properly.
+promise_test(async t => {
+ let [scroller, target] = createScrollerAndTarget(t);
+
+ document.body.appendChild(scroller);
+ document.body.appendChild(target);
+
+ scroller.style.scrollTimeline = 'timeline block';
+ target.style.animation = "anim 10s linear";
+ target.style.animationTimeline = 'timeline';
+
+ scroller.scrollTop = 50;
+ scroller.scrollLeft = 25;
+ await waitForNextFrame();
+ assert_equals(getComputedStyle(target).translate, '100px');
+
+ scroller.style.scrollTimelineAxis = 'inline';
+ await waitForNextFrame();
+ assert_equals(getComputedStyle(target).translate, '75px');
+}, 'scroll-timeline-axis is mutated');
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-data-url.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-data-url.https.html
new file mode 100644
index 00000000000..f0922193dd0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-data-url.https.html
@@ -0,0 +1,18 @@
+
+
+
Tests for importScripts: data: URL
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-data-url-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-data-url-worker.js
new file mode 100644
index 00000000000..fdabdafc630
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-data-url-worker.js
@@ -0,0 +1 @@
+importScripts('data:text/javascript,');
diff --git a/tests/wpt/web-platform-tests/storage-access-api/helpers.js b/tests/wpt/web-platform-tests/storage-access-api/helpers.js
index ddc638434ae..f718f637cd9 100644
--- a/tests/wpt/web-platform-tests/storage-access-api/helpers.js
+++ b/tests/wpt/web-platform-tests/storage-access-api/helpers.js
@@ -126,11 +126,11 @@ async function DeleteCookieInFrame(frame, name, params) {
}
// Tests whether the frame can write cookies via document.cookie. Note that this
-// overwrites, then deletes, cookies named "cookie" and "foo".
+// overwrites, then optionally deletes, cookies named "cookie" and "foo".
//
// This function requires the caller to have included
// /cookies/resources/cookie-helper.sub.js.
-async function CanFrameWriteCookies(frame) {
+async function CanFrameWriteCookies(frame, keep_after_writing = false) {
const cookie_suffix = "Secure;SameSite=None;Path=/";
await DeleteCookieInFrame(frame, "cookie", cookie_suffix);
await DeleteCookieInFrame(frame, "foo", cookie_suffix);
@@ -142,8 +142,10 @@ async function CanFrameWriteCookies(frame) {
const can_write = cookieStringHasCookie("cookie", "monster", cookies) &&
cookieStringHasCookie("foo", "bar", cookies);
- await DeleteCookieInFrame(frame, "cookie", cookie_suffix);
- await DeleteCookieInFrame(frame, "foo", cookie_suffix);
+ if (!keep_after_writing) {
+ await DeleteCookieInFrame(frame, "cookie", cookie_suffix);
+ await DeleteCookieInFrame(frame, "foo", cookie_suffix);
+ }
return can_write;
}
diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js b/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
index 67906708aed..24595ed3408 100644
--- a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
+++ b/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
@@ -30,7 +30,7 @@
assert_true(await RequestStorageAccessInFrame(frame), "requestStorageAccess resolves without requiring a gesture.");
assert_true(await FrameHasStorageAccess(frame), "frame has storage access after request.");
- assert_true(await CanFrameWriteCookies(frame), "frame can write cookies via JS after request.");
+ assert_true(await CanFrameWriteCookies(frame, /* keep_after_writing=*/true), "frame can write cookies via JS after request.");
return frame;
}
@@ -42,6 +42,7 @@
await FrameInitiatedReload(frame);
+ assert_true(cookieStringHasCookie('cookie', 'monster', await GetHTTPCookiesFromFrame(frame)), "The frame's navigation request included cookies.");
assert_true(await FrameHasStorageAccess(frame), "frame has storage access after refresh.");
assert_true(await CanFrameWriteCookies(frame), "frame can write cookies via JS after refresh.");
}, "Self-initiated reloads preserve storage access");
@@ -53,6 +54,7 @@
await FrameInitiatedNavigation(frame, altWwwResponder);
+ assert_true(cookieStringHasCookie('cookie', 'monster', await GetHTTPCookiesFromFrame(frame)), "The frame's navigation request included cookies.");
assert_true(await FrameHasStorageAccess(frame), "frame has storage access after refresh.");
assert_true(await CanFrameWriteCookies(frame), "frame can write cookies via JS after refresh.");
}, "Self-initiated same-origin navigations preserve storage access");
diff --git a/tests/wpt/web-platform-tests/storage-access-api/storage-access-permission.sub.https.window.js b/tests/wpt/web-platform-tests/storage-access-api/storage-access-permission.sub.https.window.js
index 4222051c10b..82794061bd0 100644
--- a/tests/wpt/web-platform-tests/storage-access-api/storage-access-permission.sub.https.window.js
+++ b/tests/wpt/web-platform-tests/storage-access-api/storage-access-permission.sub.https.window.js
@@ -62,10 +62,10 @@
const permission = await navigator.permissions.query({name: "storage-access"});
assert_equals(permission.name, "storage-access");
- assert_equals(permission.state, "denied");
+ assert_equals(permission.state, "prompt");
await test_driver.set_permission({ name: 'storage-access' }, 'prompt');
- }, "Permission denied state can be queried");
+ }, "Permission denied state is hidden");
promise_test(async t => {
t.add_cleanup(async () => {
diff --git a/tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py b/tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py
index 53929fce880..5abc98a09d8 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# tooltool is a lookaside cache implemented in Python
# Copyright (C) 2011 John H. Ford
@@ -22,8 +22,6 @@
# in which the manifest file resides and it should be called
# 'manifest.tt'
-from __future__ import print_function
-
import base64
import calendar
import hashlib
@@ -36,72 +34,180 @@ import os
import pprint
import re
import shutil
+import stat
import sys
import tarfile
import tempfile
import threading
import time
import zipfile
+from contextlib import closing, contextmanager
+from functools import wraps
+from io import BytesIO, open
+from random import random
+from subprocess import PIPE, Popen
-from io import open
-from io import BytesIO
-from subprocess import PIPE
-from subprocess import Popen
-
-__version__ = '1'
+__version__ = "1.4.0"
# Allowed request header characters:
# !#$%&'()*+,-./:;<=>?@[]^_`{|}~ and space, a-z, A-Z, 0-9, \, "
REQUEST_HEADER_ATTRIBUTE_CHARS = re.compile(
- r"^[ a-zA-Z0-9_\!#\$%&'\(\)\*\+,\-\./\:;<\=>\?@\[\]\^`\{\|\}~]*$")
-DEFAULT_MANIFEST_NAME = 'manifest.tt'
-TOOLTOOL_PACKAGE_SUFFIX = '.TOOLTOOL-PACKAGE'
+ r"^[ a-zA-Z0-9_\!#\$%&'\(\)\*\+,\-\./\:;<\=>\?@\[\]\^`\{\|\}~]*$"
+)
+DEFAULT_MANIFEST_NAME = "manifest.tt"
+TOOLTOOL_PACKAGE_SUFFIX = ".TOOLTOOL-PACKAGE"
HAWK_VER = 1
PY3 = sys.version_info[0] == 3
if PY3:
- open_attrs = dict(mode='w', encoding='utf-8')
six_binary_type = bytes
- six_text_type = str
- unicode = str # Silence `pyflakes` from reporting `undefined name 'unicode'` in Python 3.
+ unicode = (
+ str # Silence `pyflakes` from reporting `undefined name 'unicode'` in Python 3.
+ )
import urllib.request as urllib2
- from http.client import HTTPSConnection, HTTPConnection
- from urllib.parse import urlparse, urljoin
- from urllib.request import Request
+ from http.client import HTTPConnection, HTTPSConnection
from urllib.error import HTTPError, URLError
+ from urllib.parse import urljoin, urlparse
+ from urllib.request import Request
else:
- open_attrs = dict(mode='wb')
six_binary_type = str
- six_text_type = unicode
import urllib2
- from httplib import HTTPSConnection, HTTPConnection
- from urllib2 import Request, HTTPError, URLError
- from urlparse import urlparse, urljoin
+ from httplib import HTTPConnection, HTTPSConnection
+ from urllib2 import HTTPError, Request, URLError
+ from urlparse import urljoin, urlparse
log = logging.getLogger(__name__)
+# Vendored code from `redo` module
+def retrier(attempts=5, sleeptime=10, max_sleeptime=300, sleepscale=1.5, jitter=1):
+ """
+ This function originates from redo 2.0.3 https://github.com/mozilla-releng/redo
+ A generator function that sleeps between retries, handles exponential
+ backoff and jitter. The action you are retrying is meant to run after
+ retrier yields.
+ """
+ jitter = jitter or 0 # py35 barfs on the next line if jitter is None
+ if jitter > sleeptime:
+ # To prevent negative sleep times
+ raise Exception(
+ "jitter ({}) must be less than sleep time ({})".format(jitter, sleeptime)
+ )
+
+ sleeptime_real = sleeptime
+ for _ in range(attempts):
+ log.debug("attempt %i/%i", _ + 1, attempts)
+
+ yield sleeptime_real
+
+ if jitter:
+ sleeptime_real = sleeptime + random.uniform(-jitter, jitter)
+ # our jitter should scale along with the sleeptime
+ jitter = jitter * sleepscale
+ else:
+ sleeptime_real = sleeptime
+
+ sleeptime *= sleepscale
+
+ if sleeptime_real > max_sleeptime:
+ sleeptime_real = max_sleeptime
+
+ # Don't need to sleep the last time
+ if _ < attempts - 1:
+ log.debug(
+ "sleeping for %.2fs (attempt %i/%i)", sleeptime_real, _ + 1, attempts
+ )
+ time.sleep(sleeptime_real)
+
+
+def retry(
+ action,
+ attempts=5,
+ sleeptime=60,
+ max_sleeptime=5 * 60,
+ sleepscale=1.5,
+ jitter=1,
+ retry_exceptions=(Exception,),
+ cleanup=None,
+ args=(),
+ kwargs={},
+ log_args=True,
+):
+ """
+ This function originates from redo 2.0.3 https://github.com/mozilla-releng/redo
+ Calls an action function until it succeeds, or we give up.
+ """
+ assert callable(action)
+ assert not cleanup or callable(cleanup)
+
+ action_name = getattr(action, "__name__", action)
+ if log_args and (args or kwargs):
+ log_attempt_args = (
+ "retry: calling %s with args: %s," " kwargs: %s, attempt #%d",
+ action_name,
+ args,
+ kwargs,
+ )
+ else:
+ log_attempt_args = ("retry: calling %s, attempt #%d", action_name)
+
+ if max_sleeptime < sleeptime:
+ log.debug("max_sleeptime %d less than sleeptime %d", max_sleeptime, sleeptime)
+
+ n = 1
+ for _ in retrier(
+ attempts=attempts,
+ sleeptime=sleeptime,
+ max_sleeptime=max_sleeptime,
+ sleepscale=sleepscale,
+ jitter=jitter,
+ ):
+ try:
+ logfn = log.info if n != 1 else log.debug
+ logfn_args = log_attempt_args + (n,)
+ logfn(*logfn_args)
+ return action(*args, **kwargs)
+ except retry_exceptions:
+ log.debug("retry: Caught exception: ", exc_info=True)
+ if cleanup:
+ cleanup()
+ if n == attempts:
+ log.info("retry: Giving up on %s", action_name)
+ raise
+ continue
+ finally:
+ n += 1
+
+
+def retriable(*retry_args, **retry_kwargs):
+ """
+ This function originates from redo 2.0.3 https://github.com/mozilla-releng/redo
+ A decorator factory for retry(). Wrap your function in @retriable(...) to
+ give it retry powers!
+ """
+
+ def _retriable_factory(func):
+ @wraps(func)
+ def _retriable_wrapper(*args, **kwargs):
+ return retry(func, args=args, kwargs=kwargs, *retry_args, **retry_kwargs)
+
+ return _retriable_wrapper
+
+ return _retriable_factory
+
+
+# end of vendored code from redo module
+
+
def request_has_data(req):
if PY3:
return req.data is not None
return req.has_data()
-def to_binary(val):
- if isinstance(val, six_text_type):
- return val.encode('utf-8')
- return val
-
-
-def to_text(val):
- if isinstance(val, six_binary_type):
- return val.decode('utf-8')
- return val
-
-
def get_hexdigest(val):
- return hashlib.sha512(to_binary(val)).hexdigest()
+ return hashlib.sha512(val).hexdigest()
class FileRecordJSONEncoderException(Exception):
@@ -113,7 +219,6 @@ class InvalidManifest(Exception):
class ExceptionWithFilename(Exception):
-
def __init__(self, filename):
Exception.__init__(self)
self.filename = filename
@@ -142,22 +247,24 @@ class BadHeaderValue(Exception):
def parse_url(url):
url_parts = urlparse(url)
url_dict = {
- 'scheme': url_parts.scheme,
- 'hostname': url_parts.hostname,
- 'port': url_parts.port,
- 'path': url_parts.path,
- 'resource': url_parts.path,
- 'query': url_parts.query,
+ "scheme": url_parts.scheme,
+ "hostname": url_parts.hostname,
+ "port": url_parts.port,
+ "path": url_parts.path,
+ "resource": url_parts.path,
+ "query": url_parts.query,
}
- if len(url_dict['query']) > 0:
- url_dict['resource'] = '%s?%s' % (url_dict['resource'], # pragma: no cover
- url_dict['query'])
+ if len(url_dict["query"]) > 0:
+ url_dict["resource"] = "%s?%s" % (
+ url_dict["resource"], # pragma: no cover
+ url_dict["query"],
+ )
if url_parts.port is None:
- if url_parts.scheme == 'http':
- url_dict['port'] = 80
- elif url_parts.scheme == 'https': # pragma: no cover
- url_dict['port'] = 443
+ if url_parts.scheme == "http":
+ url_dict["port"] = 80
+ elif url_parts.scheme == "https": # pragma: no cover
+ url_dict["port"] = 443
return url_dict
@@ -171,110 +278,119 @@ def random_string(length):
def prepare_header_val(val):
if isinstance(val, six_binary_type):
- val = val.decode('utf-8')
+ val = val.decode("utf-8")
if not REQUEST_HEADER_ATTRIBUTE_CHARS.match(val):
raise BadHeaderValue( # pragma: no cover
- 'header value value={val} contained an illegal character'.format(val=repr(val)))
+ "header value value={val} contained an illegal character".format(
+ val=repr(val)
+ )
+ )
return val
def parse_content_type(content_type): # pragma: no cover
if content_type:
- return content_type.split(';')[0].strip().lower()
+ return content_type.split(";")[0].strip().lower()
else:
- return ''
+ return ""
def calculate_payload_hash(algorithm, payload, content_type): # pragma: no cover
parts = [
- part if isinstance(part, six_binary_type) else part.encode('utf8')
- for part in ['hawk.' + str(HAWK_VER) + '.payload\n',
- parse_content_type(content_type) + '\n',
- payload or '',
- '\n',
- ]
+ part if isinstance(part, six_binary_type) else part.encode("utf8")
+ for part in [
+ "hawk." + str(HAWK_VER) + ".payload\n",
+ parse_content_type(content_type) + "\n",
+ payload or "",
+ "\n",
+ ]
]
p_hash = hashlib.new(algorithm)
- p_hash.update(''.join(parts))
+ for p in parts:
+ p_hash.update(p)
- log.debug('calculating payload hash from:\n{parts}'.format(parts=pprint.pformat(parts)))
+ log.debug(
+ "calculating payload hash from:\n{parts}".format(parts=pprint.pformat(parts))
+ )
return base64.b64encode(p_hash.digest())
def validate_taskcluster_credentials(credentials):
- if not hasattr(credentials, '__getitem__'):
- raise InvalidCredentials('credentials must be a dict-like object') # pragma: no cover
+ if not hasattr(credentials, "__getitem__"):
+ raise InvalidCredentials(
+ "credentials must be a dict-like object"
+ ) # pragma: no cover
try:
- credentials['clientId']
- credentials['accessToken']
+ credentials["clientId"]
+ credentials["accessToken"]
except KeyError: # pragma: no cover
etype, val, tb = sys.exc_info()
- raise InvalidCredentials('{etype}: {val}'.format(etype=etype, val=val))
+ raise InvalidCredentials("{etype}: {val}".format(etype=etype, val=val))
def normalize_header_attr(val):
if isinstance(val, six_binary_type):
- return val.decode('utf-8')
+ return val.decode("utf-8")
return val # pragma: no cover
-def normalize_string(mac_type,
- timestamp,
- nonce,
- method,
- name,
- host,
- port,
- content_hash,
- ):
- return '\n'.join([
- normalize_header_attr(header)
- # The blank lines are important. They follow what the Node Hawk lib does.
- for header in ['hawk.' + str(HAWK_VER) + '.' + mac_type,
- timestamp,
- nonce,
- method or '',
- name or '',
- host,
- port,
- content_hash or '',
- '', # for ext which is empty in this case
- '', # Add trailing new line.
- ]
- ])
+def normalize_string(
+ mac_type,
+ timestamp,
+ nonce,
+ method,
+ name,
+ host,
+ port,
+ content_hash,
+):
+ return "\n".join(
+ [
+ normalize_header_attr(header)
+ # The blank lines are important. They follow what the Node Hawk lib does.
+ for header in [
+ "hawk." + str(HAWK_VER) + "." + mac_type,
+ timestamp,
+ nonce,
+ method or "",
+ name or "",
+ host,
+ port,
+ content_hash or "",
+ "", # for ext which is empty in this case
+ "", # Add trailing new line.
+ ]
+ ]
+ )
-def calculate_mac(mac_type,
- access_token,
- algorithm,
- timestamp,
- nonce,
- method,
- name,
- host,
- port,
- content_hash,
- ):
- normalized = normalize_string(mac_type,
- timestamp,
- nonce,
- method,
- name,
- host,
- port,
- content_hash)
- log.debug(u'normalized resource for mac calc: {norm}'.format(norm=normalized))
+def calculate_mac(
+ mac_type,
+ access_token,
+ algorithm,
+ timestamp,
+ nonce,
+ method,
+ name,
+ host,
+ port,
+ content_hash,
+):
+ normalized = normalize_string(
+ mac_type, timestamp, nonce, method, name, host, port, content_hash
+ )
+ log.debug(u"normalized resource for mac calc: {norm}".format(norm=normalized))
digestmod = getattr(hashlib, algorithm)
if not isinstance(normalized, six_binary_type):
- normalized = normalized.encode('utf8')
+ normalized = normalized.encode("utf8")
if not isinstance(access_token, six_binary_type):
- access_token = access_token.encode('ascii')
+ access_token = access_token.encode("ascii")
result = hmac.new(access_token, normalized, digestmod)
return base64.b64encode(result.digest())
@@ -285,31 +401,36 @@ def make_taskcluster_header(credentials, req):
url = req.get_full_url()
method = req.get_method()
- algorithm = 'sha256'
+ algorithm = "sha256"
timestamp = str(utc_now())
nonce = random_string(6)
url_parts = parse_url(url)
content_hash = None
if request_has_data(req):
+ if PY3:
+ data = req.data
+ else:
+ data = req.get_data()
content_hash = calculate_payload_hash( # pragma: no cover
algorithm,
- req.get_data(),
+ data,
# maybe we should detect this from req.headers but we anyway expect json
- content_type='application/json',
+ content_type="application/json",
)
- mac = calculate_mac('header',
- credentials['accessToken'],
- algorithm,
- timestamp,
- nonce,
- method,
- url_parts['resource'],
- url_parts['hostname'],
- str(url_parts['port']),
- content_hash,
- )
+ mac = calculate_mac(
+ "header",
+ credentials["accessToken"],
+ algorithm,
+ timestamp,
+ nonce,
+ method,
+ url_parts["resource"],
+ url_parts["hostname"],
+ str(url_parts["port"]),
+ content_hash,
+ )
header = u'Hawk mac="{}"'.format(prepare_header_val(mac))
@@ -318,24 +439,32 @@ def make_taskcluster_header(credentials, req):
header = u'{header}, id="{id}", ts="{ts}", nonce="{nonce}"'.format(
header=header,
- id=prepare_header_val(credentials['clientId']),
+ id=prepare_header_val(credentials["clientId"]),
ts=prepare_header_val(timestamp),
nonce=prepare_header_val(nonce),
)
- log.debug('Hawk header for URL={} method={}: {}'.format(url, method, header))
+ log.debug("Hawk header for URL={} method={}: {}".format(url, method, header))
return header
class FileRecord(object):
-
- def __init__(self, filename, size, digest, algorithm, unpack=False,
- version=None, visibility=None):
+ def __init__(
+ self,
+ filename,
+ size,
+ digest,
+ algorithm,
+ unpack=False,
+ version=None,
+ visibility=None,
+ ):
object.__init__(self)
- if '/' in filename or '\\' in filename:
+ if "/" in filename or "\\" in filename:
log.error(
- "The filename provided contains path information and is, therefore, invalid.")
+ "The filename provided contains path information and is, therefore, invalid."
+ )
raise BadFilenameException(filename=filename)
self.filename = filename
self.size = size
@@ -348,12 +477,14 @@ class FileRecord(object):
def __eq__(self, other):
if self is other:
return True
- if self.filename == other.filename and \
- self.size == other.size and \
- self.digest == other.digest and \
- self.algorithm == other.algorithm and \
- self.version == other.version and \
- self.visibility == other.visibility:
+ if (
+ self.filename == other.filename
+ and self.size == other.size
+ and self.digest == other.digest
+ and self.algorithm == other.algorithm
+ and self.version == other.version
+ and self.visibility == other.visibility
+ ):
return True
else:
return False
@@ -365,9 +496,18 @@ class FileRecord(object):
return repr(self)
def __repr__(self):
- return "%s.%s(filename='%s', size=%s, digest='%s', algorithm='%s', visibility=%r)" % (
- __name__, self.__class__.__name__, self.filename, self.size,
- self.digest, self.algorithm, self.visibility)
+ return (
+ "%s.%s(filename='%s', size=%s, digest='%s', algorithm='%s', visibility=%r)"
+ % (
+ __name__,
+ self.__class__.__name__,
+ self.filename,
+ self.size,
+ self.digest,
+ self.algorithm,
+ self.visibility,
+ )
+ )
def present(self):
# Doesn't check validity
@@ -377,17 +517,15 @@ class FileRecord(object):
if self.present():
return self.size == os.path.getsize(self.filename)
else:
- log.debug(
- "trying to validate size on a missing file, %s", self.filename)
+ log.debug("trying to validate size on a missing file, %s", self.filename)
raise MissingFileException(filename=self.filename)
def validate_digest(self):
if self.present():
- with open(self.filename, 'rb') as f:
+ with open(self.filename, "rb") as f:
return self.digest == digest_file(f, self.algorithm)
else:
- log.debug(
- "trying to validate digest on a missing file, %s', self.filename")
+ log.debug("trying to validate digest on a missing file, %s', self.filename")
raise MissingFileException(filename=self.filename)
def validate(self):
@@ -406,35 +544,40 @@ class FileRecord(object):
def create_file_record(filename, algorithm):
- fo = open(filename, 'rb')
+ fo = open(filename, "rb")
stored_filename = os.path.split(filename)[1]
- fr = FileRecord(stored_filename, os.path.getsize(
- filename), digest_file(fo, algorithm), algorithm)
+ fr = FileRecord(
+ stored_filename,
+ os.path.getsize(filename),
+ digest_file(fo, algorithm),
+ algorithm,
+ )
fo.close()
return fr
class FileRecordJSONEncoder(json.JSONEncoder):
-
def encode_file_record(self, obj):
if not issubclass(type(obj), FileRecord):
- err = "FileRecordJSONEncoder is only for FileRecord and lists of FileRecords, " \
- "not %s" % obj.__class__.__name__
+ err = (
+ "FileRecordJSONEncoder is only for FileRecord and lists of FileRecords, "
+ "not %s" % obj.__class__.__name__
+ )
log.warn(err)
raise FileRecordJSONEncoderException(err)
else:
rv = {
- 'filename': obj.filename,
- 'size': obj.size,
- 'algorithm': obj.algorithm,
- 'digest': obj.digest,
+ "filename": obj.filename,
+ "size": obj.size,
+ "algorithm": obj.algorithm,
+ "digest": obj.digest,
}
if obj.unpack:
- rv['unpack'] = True
+ rv["unpack"] = True
if obj.version:
- rv['version'] = obj.version
+ rv["version"] = obj.version
if obj.visibility is not None:
- rv['visibility'] = obj.visibility
+ rv["visibility"] = obj.visibility
return rv
def default(self, f):
@@ -452,6 +595,7 @@ class FileRecordJSONDecoder(json.JSONDecoder):
"""I help the json module materialize a FileRecord from
a JSON file. I understand FileRecords and lists of
FileRecords. I ignore things that I don't expect for now"""
+
# TODO: make this more explicit in what it's looking for
# and error out on unexpected things
@@ -464,10 +608,10 @@ class FileRecordJSONDecoder(json.JSONDecoder):
record_list.append(record)
return record_list
required_fields = [
- 'filename',
- 'size',
- 'algorithm',
- 'digest',
+ "filename",
+ "size",
+ "algorithm",
+ "digest",
]
if isinstance(obj, dict):
missing = False
@@ -477,12 +621,18 @@ class FileRecordJSONDecoder(json.JSONDecoder):
break
if not missing:
- unpack = obj.get('unpack', False)
- version = obj.get('version', None)
- visibility = obj.get('visibility', None)
+ unpack = obj.get("unpack", False)
+ version = obj.get("version", None)
+ visibility = obj.get("visibility", None)
rv = FileRecord(
- obj['filename'], obj['size'], obj['digest'], obj['algorithm'],
- unpack, version, visibility)
+ obj["filename"],
+ obj["size"],
+ obj["digest"],
+ obj["algorithm"],
+ unpack,
+ version,
+ visibility,
+ )
log.debug("materialized %s" % rv)
return rv
return obj
@@ -495,7 +645,7 @@ class FileRecordJSONDecoder(json.JSONDecoder):
class Manifest(object):
- valid_formats = ('json',)
+ valid_formats = ("json",)
def __init__(self, file_records=None):
self.file_records = file_records or []
@@ -504,7 +654,7 @@ class Manifest(object):
if self is other:
return True
if len(self.file_records) != len(other.file_records):
- log.debug('Manifests differ in number of files')
+ log.debug("Manifests differ in number of files")
return False
# sort the file records by filename before comparing
mine = sorted((fr.filename, fr) for fr in self.file_records)
@@ -536,39 +686,44 @@ class Manifest(object):
def validate(self):
return all(i.validate() for i in self.file_records)
- def load(self, data_file, fmt='json'):
+ def load(self, data_file, fmt="json"):
assert fmt in self.valid_formats
- if fmt == 'json':
+ if fmt == "json":
try:
self.file_records.extend(
- json.load(data_file, cls=FileRecordJSONDecoder))
+ json.load(data_file, cls=FileRecordJSONDecoder)
+ )
except ValueError:
raise InvalidManifest("trying to read invalid manifest file")
- def loads(self, data_string, fmt='json'):
+ def loads(self, data_string, fmt="json"):
assert fmt in self.valid_formats
- if fmt == 'json':
+ if fmt == "json":
try:
self.file_records.extend(
- json.loads(data_string, cls=FileRecordJSONDecoder))
+ json.loads(data_string, cls=FileRecordJSONDecoder)
+ )
except ValueError:
raise InvalidManifest("trying to read invalid manifest file")
- def dump(self, output_file, fmt='json'):
+ def dump(self, output_file, fmt="json"):
assert fmt in self.valid_formats
- if fmt == 'json':
+ if fmt == "json":
return json.dump(
- self.file_records, output_file,
- indent=2, separators=(',', ': '),
+ self.file_records,
+ output_file,
+ indent=2,
+ separators=(",", ": "),
cls=FileRecordJSONEncoder,
)
- def dumps(self, fmt='json'):
+ def dumps(self, fmt="json"):
assert fmt in self.valid_formats
- if fmt == 'json':
+ if fmt == "json":
return json.dumps(
self.file_records,
- indent=2, separators=(',', ': '),
+ indent=2,
+ separators=(",", ": "),
cls=FileRecordJSONEncoder,
)
@@ -582,8 +737,8 @@ def digest_file(f, a):
while data:
h.update(data)
data = f.read(chunk_size)
- name = repr(f.name) if hasattr(f, 'name') else 'a file'
- log.debug('hashed %s with %s to be %s', name, a, h.hexdigest())
+ name = repr(f.name) if hasattr(f, "name") else "a file"
+ log.debug("hashed %s with %s to be %s", name, a, h.hexdigest())
return h.hexdigest()
@@ -594,7 +749,7 @@ def execute(cmd):
line = process.stdout.readline()
if not line:
break
- log.info(line.replace('\n', ' '))
+ log.info(line.replace("\n", " "))
return process.wait() == 0
@@ -602,14 +757,13 @@ def open_manifest(manifest_file):
"""I know how to take a filename and load it into a Manifest object"""
if os.path.exists(manifest_file):
manifest = Manifest()
- with open(manifest_file, "rb") as f:
+ with open(manifest_file, "r" if PY3 else "rb") as f:
manifest.load(f)
log.debug("loaded manifest from file '%s'" % manifest_file)
return manifest
else:
log.debug("tried to load absent file '%s' as manifest" % manifest_file)
- raise InvalidManifest(
- "manifest file '%s' does not exist" % manifest_file)
+ raise InvalidManifest("manifest file '%s' does not exist" % manifest_file)
def list_manifest(manifest_file):
@@ -617,15 +771,22 @@ def list_manifest(manifest_file):
try:
manifest = open_manifest(manifest_file)
except InvalidManifest as e:
- log.error("failed to load manifest file at '%s': %s" % (
- manifest_file,
- str(e),
- ))
+ log.error(
+ "failed to load manifest file at '%s': %s"
+ % (
+ manifest_file,
+ str(e),
+ )
+ )
return False
for f in manifest.file_records:
- print("{}\t{}\t{}".format("P" if f.present() else "-",
- "V" if f.present() and f.validate() else "-",
- f.filename))
+ print(
+ "{}\t{}\t{}".format(
+ "P" if f.present() else "-",
+ "V" if f.present() and f.validate() else "-",
+ f.filename,
+ )
+ )
return True
@@ -635,10 +796,13 @@ def validate_manifest(manifest_file):
try:
manifest = open_manifest(manifest_file)
except InvalidManifest as e:
- log.error("failed to load manifest file at '%s': %s" % (
- manifest_file,
- str(e),
- ))
+ log.error(
+ "failed to load manifest file at '%s': %s"
+ % (
+ manifest_file,
+ str(e),
+ )
+ )
return False
invalid_files = []
absent_files = []
@@ -677,13 +841,17 @@ def add_files(manifest_file, algorithm, filenames, version, visibility, unpack):
log.debug("appending a new file record to manifest file")
add = True
for fr in old_manifest.file_records:
- log.debug("manifest file has '%s'" % "', ".join(
- [x.filename for x in old_manifest.file_records]))
+ log.debug(
+ "manifest file has '%s'"
+ % "', ".join([x.filename for x in old_manifest.file_records])
+ )
if new_fr == fr:
log.info("file already in old_manifest")
add = False
elif filename == fr.filename:
- log.error("manifest already contains a different file named %s" % filename)
+ log.error(
+ "manifest already contains a different file named %s" % filename
+ )
add = False
if add:
new_manifest.file_records.append(new_fr)
@@ -695,8 +863,12 @@ def add_files(manifest_file, algorithm, filenames, version, visibility, unpack):
for old_fr in old_manifest.file_records:
if old_fr.filename not in new_filenames:
new_manifest.file_records.append(old_fr)
- with open(manifest_file, **open_attrs) as output:
- new_manifest.dump(output, fmt='json')
+ if PY3:
+ with open(manifest_file, mode="w") as output:
+ new_manifest.dump(output, fmt="json")
+ else:
+ with open(manifest_file, mode="wb") as output:
+ new_manifest.dump(output, fmt="json")
return all_files_added
@@ -706,7 +878,17 @@ def touch(f):
try:
os.utime(f, None)
except OSError:
- log.warn('impossible to update utime of file %s' % f)
+ log.warn("impossible to update utime of file %s" % f)
+
+
+@contextmanager
+@retriable(sleeptime=2)
+def request(url, auth_file=None):
+ req = Request(url)
+ _authorize(req, auth_file)
+ with closing(urllib2.urlopen(req)) as f:
+ log.debug("opened %s for reading" % url)
+ yield f
def fetch_file(base_urls, file_record, grabchunk=1024 * 4, auth_file=None, region=None):
@@ -717,42 +899,41 @@ def fetch_file(base_urls, file_record, grabchunk=1024 * 4, auth_file=None, regio
fetched_path = None
for base_url in base_urls:
# Generate the URL for the file on the server side
- url = urljoin(base_url,
- '%s/%s' % (file_record.algorithm, file_record.digest))
+ url = urljoin(base_url, "%s/%s" % (file_record.algorithm, file_record.digest))
if region is not None:
- url += '?region=' + region
+ url += "?region=" + region
log.info("Attempting to fetch from '%s'..." % base_url)
# Well, the file doesn't exist locally. Let's fetch it.
try:
- req = Request(url)
- _authorize(req, auth_file)
- f = urllib2.urlopen(req)
- log.debug("opened %s for reading" % url)
- with open(temp_path, **open_attrs) as out:
+ with request(url, auth_file) as f, open(temp_path, mode="wb") as out:
k = True
size = 0
while k:
# TODO: print statistics as file transfers happen both for info and to stop
# buildbot timeouts
indata = f.read(grabchunk)
- if PY3:
- indata = to_text(indata)
out.write(indata)
size += len(indata)
if len(indata) == 0:
k = False
- log.info("File %s fetched from %s as %s" %
- (file_record.filename, base_url, temp_path))
+ log.info(
+ "File %s fetched from %s as %s"
+ % (file_record.filename, base_url, temp_path)
+ )
fetched_path = temp_path
break
except (URLError, HTTPError, ValueError):
- log.info("...failed to fetch '%s' from %s" %
- (file_record.filename, base_url), exc_info=True)
+ log.info(
+ "...failed to fetch '%s' from %s" % (file_record.filename, base_url),
+ exc_info=True,
+ )
except IOError: # pragma: no cover
- log.info("failed to write to temporary file for '%s'" %
- file_record.filename, exc_info=True)
+ log.info(
+ "failed to write to temporary file for '%s'" % file_record.filename,
+ exc_info=True,
+ )
# cleanup temp file in case of issues
if fetched_path:
@@ -768,16 +949,43 @@ def fetch_file(base_urls, file_record, grabchunk=1024 * 4, auth_file=None, regio
def clean_path(dirname):
"""Remove a subtree if is exists. Helper for unpack_file()."""
if os.path.exists(dirname):
- log.info('rm tree: %s' % dirname)
+ log.info("rm tree: %s" % dirname)
shutil.rmtree(dirname)
CHECKSUM_SUFFIX = ".checksum"
+def validate_tar_member(member, path):
+ def _is_within_directory(directory, target):
+ real_directory = os.path.realpath(directory)
+ real_target = os.path.realpath(target)
+ prefix = os.path.commonprefix([real_directory, real_target])
+ return prefix == real_directory
+
+ member_path = os.path.join(path, member.name)
+ if not _is_within_directory(path, member_path):
+ raise Exception("Attempted path traversal in tar file: " + member.name)
+ if member.issym():
+ link_path = os.path.join(os.path.dirname(member_path), member.linkname)
+ if not _is_within_directory(path, link_path):
+ raise Exception("Attempted link path traversal in tar file: " + member.name)
+ if member.mode & (stat.S_ISUID | stat.S_ISGID):
+ raise Exception("Attempted setuid or setgid in tar file: " + member.name)
+
+
+def safe_extract(tar, path=".", *, numeric_owner=False):
+ def _files(tar, path):
+ for member in tar:
+ validate_tar_member(member, path)
+ yield member
+
+ tar.extractall(path, members=_files(tar, path), numeric_owner=numeric_owner)
+
+
def unpack_file(filename):
"""Untar `filename`, assuming it is uncompressed or compressed with bzip2,
- xz, gzip, or unzip a zip file. The file is assumed to contain a single
+ xz, gzip, zst, or unzip a zip file. The file is assumed to contain a single
directory with a name matching the base of the given filename.
Xz support is handled by shelling out to 'tar'."""
if os.path.isfile(filename) and tarfile.is_tarfile(filename):
@@ -785,26 +993,34 @@ def unpack_file(filename):
base_file, tar_ext = os.path.splitext(tar_file)
clean_path(base_file)
log.info('untarring "%s"' % filename)
- tar = tarfile.open(filename)
- tar.extractall()
- tar.close()
- elif os.path.isfile(filename) and filename.endswith('.tar.xz'):
- base_file = filename.replace('.tar.xz', '')
+ with tarfile.open(filename) as tar:
+ safe_extract(tar)
+ elif os.path.isfile(filename) and filename.endswith(".tar.xz"):
+ base_file = filename.replace(".tar.xz", "")
clean_path(base_file)
log.info('untarring "%s"' % filename)
# Not using tar -Jxf because it fails on Windows for some reason.
- process = Popen(['xz', '-d', '-c', filename], stdout=PIPE)
+ process = Popen(["xz", "-d", "-c", filename], stdout=PIPE)
stdout, stderr = process.communicate()
if process.returncode != 0:
return False
fileobj = BytesIO()
fileobj.write(stdout)
fileobj.seek(0)
- tar = tarfile.open(fileobj=fileobj, mode='r|')
- tar.extractall()
- tar.close()
+ with tarfile.open(fileobj=fileobj, mode="r|") as tar:
+ safe_extract(tar)
+ elif os.path.isfile(filename) and filename.endswith(".tar.zst"):
+ import zstandard
+
+ base_file = filename.replace(".tar.zst", "")
+ clean_path(base_file)
+ log.info('untarring "%s"' % filename)
+ dctx = zstandard.ZstdDecompressor()
+ with dctx.stream_reader(open(filename, "rb")) as fileobj:
+ with tarfile.open(fileobj=fileobj, mode="r|") as tar:
+ safe_extract(tar)
elif os.path.isfile(filename) and zipfile.is_zipfile(filename):
- base_file = filename.replace('.zip', '')
+ base_file = filename.replace(".zip", "")
clean_path(base_file)
log.info('unzipping "%s"' % filename)
z = zipfile.ZipFile(filename)
@@ -816,16 +1032,25 @@ def unpack_file(filename):
return True
-def fetch_files(manifest_file, base_urls, filenames=[], cache_folder=None,
- auth_file=None, region=None):
+def fetch_files(
+ manifest_file,
+ base_urls,
+ filenames=[],
+ cache_folder=None,
+ auth_file=None,
+ region=None,
+):
# Lets load the manifest file
try:
manifest = open_manifest(manifest_file)
except InvalidManifest as e:
- log.error("failed to load manifest file at '%s': %s" % (
- manifest_file,
- str(e),
- ))
+ log.error(
+ "failed to load manifest file at '%s': %s"
+ % (
+ manifest_file,
+ str(e),
+ )
+ )
return False
# we want to track files already in current working directory AND valid
@@ -852,21 +1077,27 @@ def fetch_files(manifest_file, base_urls, filenames=[], cache_folder=None,
# we have an invalid file here, better to cleanup!
# this invalid file needs to be replaced with a good one
# from the local cash or fetched from a tooltool server
- log.info("File %s is present locally but it is invalid, so I will remove it "
- "and try to fetch it" % f.filename)
+ log.info(
+ "File %s is present locally but it is invalid, so I will remove it "
+ "and try to fetch it" % f.filename
+ )
os.remove(os.path.join(os.getcwd(), f.filename))
# check if file is already in cache
if cache_folder and f.filename not in present_files:
try:
- shutil.copy(os.path.join(cache_folder, f.digest),
- os.path.join(os.getcwd(), f.filename))
- log.info("File %s retrieved from local cache %s" %
- (f.filename, cache_folder))
+ shutil.copy(
+ os.path.join(cache_folder, f.digest),
+ os.path.join(os.getcwd(), f.filename),
+ )
+ log.info(
+ "File %s retrieved from local cache %s" % (f.filename, cache_folder)
+ )
touch(os.path.join(cache_folder, f.digest))
filerecord_for_validation = FileRecord(
- f.filename, f.size, f.digest, f.algorithm)
+ f.filename, f.size, f.digest, f.algorithm
+ )
if filerecord_for_validation.validate():
present_files.append(f.filename)
if f.unpack:
@@ -874,13 +1105,17 @@ def fetch_files(manifest_file, base_urls, filenames=[], cache_folder=None,
else:
# the file copied from the cache is invalid, better to
# clean up the cache version itself as well
- log.warn("File %s retrieved from cache is invalid! I am deleting it from the "
- "cache as well" % f.filename)
+ log.warn(
+ "File %s retrieved from cache is invalid! I am deleting it from the "
+ "cache as well" % f.filename
+ )
os.remove(os.path.join(os.getcwd(), f.filename))
os.remove(os.path.join(cache_folder, f.digest))
except IOError:
- log.info("File %s not present in local cache folder %s" %
- (f.filename, cache_folder))
+ log.info(
+ "File %s not present in local cache folder %s"
+ % (f.filename, cache_folder)
+ )
# now I will try to fetch all files which are not already present and
# valid, appending a suffix to avoid race conditions
@@ -889,9 +1124,13 @@ def fetch_files(manifest_file, base_urls, filenames=[], cache_folder=None,
# is a non empty list it can be used to filter if filename is in
# present_files, it means that I have it already because it was already
# either in the working dir or in the cache
- if (f.filename in filenames or len(filenames) == 0) and f.filename not in present_files:
+ if (
+ f.filename in filenames or len(filenames) == 0
+ ) and f.filename not in present_files:
log.debug("fetching %s" % f.filename)
- temp_file_name = fetch_file(base_urls, f, auth_file=auth_file, region=region)
+ temp_file_name = fetch_file(
+ base_urls, f, auth_file=auth_file, region=region
+ )
if temp_file_name:
fetched_files.append((f, temp_file_name))
else:
@@ -905,15 +1144,20 @@ def fetch_files(manifest_file, base_urls, filenames=[], cache_folder=None,
# this is why filerecord_for_validation is created
filerecord_for_validation = FileRecord(
- temp_file_name, localfile.size, localfile.digest, localfile.algorithm)
+ temp_file_name, localfile.size, localfile.digest, localfile.algorithm
+ )
if filerecord_for_validation.validate():
# great!
# I can rename the temp file
- log.info("File integrity verified, renaming %s to %s" %
- (temp_file_name, localfile.filename))
- os.rename(os.path.join(os.getcwd(), temp_file_name),
- os.path.join(os.getcwd(), localfile.filename))
+ log.info(
+ "File integrity verified, renaming %s to %s"
+ % (temp_file_name, localfile.filename)
+ )
+ os.rename(
+ os.path.join(os.getcwd(), temp_file_name),
+ os.path.join(os.getcwd(), localfile.filename),
+ )
if localfile.unpack:
unpack_files.append(localfile.filename)
@@ -926,14 +1170,21 @@ def fetch_files(manifest_file, base_urls, filenames=[], cache_folder=None,
if not os.path.exists(cache_folder):
log.info("Creating cache in %s..." % cache_folder)
os.makedirs(cache_folder, 0o0700)
- shutil.copy(os.path.join(os.getcwd(), localfile.filename),
- os.path.join(cache_folder, localfile.digest))
- log.info("Local cache %s updated with %s" % (cache_folder,
- localfile.filename))
+ shutil.copy(
+ os.path.join(os.getcwd(), localfile.filename),
+ os.path.join(cache_folder, localfile.digest),
+ )
+ log.info(
+ "Local cache %s updated with %s"
+ % (cache_folder, localfile.filename)
+ )
touch(os.path.join(cache_folder, localfile.digest))
except (OSError, IOError):
- log.warning('Impossible to add file %s to cache folder %s' %
- (localfile.filename, cache_folder), exc_info=True)
+ log.warning(
+ "Impossible to add file %s to cache folder %s"
+ % (localfile.filename, cache_folder),
+ exc_info=True,
+ )
else:
failed_files.append(localfile.filename)
log.error("'%s'" % filerecord_for_validation.describe())
@@ -946,20 +1197,18 @@ def fetch_files(manifest_file, base_urls, filenames=[], cache_folder=None,
# If we failed to fetch or validate a file, we need to fail
if len(failed_files) > 0:
- log.error("The following files failed: '%s'" %
- "', ".join(failed_files))
+ log.error("The following files failed: '%s'" % "', ".join(failed_files))
return False
return True
def freespace(p):
"Returns the number of bytes free under directory `p`"
- if sys.platform == 'win32': # pragma: no cover
+ if sys.platform == "win32": # pragma: no cover
# os.statvfs doesn't work on Windows
import win32file
- secsPerClus, bytesPerSec, nFreeClus, totClus = win32file.GetDiskFreeSpace(
- p)
+ secsPerClus, bytesPerSec, nFreeClus, totClus = win32file.GetDiskFreeSpace(p)
return secsPerClus * bytesPerSec * nFreeClus
else:
r = os.statvfs(p)
@@ -1000,94 +1249,102 @@ def purge(folder, gigs):
def _log_api_error(e):
- if hasattr(e, 'hdrs') and e.hdrs['content-type'] == 'application/json':
+ if hasattr(e, "hdrs") and e.hdrs["content-type"] == "application/json":
json_resp = json.load(e.fp)
- log.error("%s: %s" % (json_resp['error']['name'],
- json_resp['error']['description']))
+ log.error(
+ "%s: %s" % (json_resp["error"]["name"], json_resp["error"]["description"])
+ )
else:
log.exception("Error making RelengAPI request:")
def _authorize(req, auth_file):
- if not auth_file:
- return
-
is_taskcluster_auth = False
- with open(auth_file) as f:
- auth_file_content = f.read().strip()
+
+ if not auth_file:
try:
- auth_file_content = json.loads(auth_file_content)
+ taskcluster_env_keys = {
+ "clientId": "TASKCLUSTER_CLIENT_ID",
+ "accessToken": "TASKCLUSTER_ACCESS_TOKEN",
+ }
+ auth_content = {k: os.environ[v] for k, v in taskcluster_env_keys.items()}
is_taskcluster_auth = True
- except Exception:
- pass
+ except KeyError:
+ return
+ else:
+ with open(auth_file) as f:
+ auth_content = f.read().strip()
+ try:
+ auth_content = json.loads(auth_content)
+ is_taskcluster_auth = True
+ except Exception:
+ pass
if is_taskcluster_auth:
- taskcluster_header = make_taskcluster_header(auth_file_content, req)
+ taskcluster_header = make_taskcluster_header(auth_content, req)
log.debug("Using taskcluster credentials in %s" % auth_file)
- req.add_unredirected_header('Authorization', taskcluster_header)
+ req.add_unredirected_header("Authorization", taskcluster_header)
else:
log.debug("Using Bearer token in %s" % auth_file)
- req.add_unredirected_header('Authorization', 'Bearer %s' % auth_file_content)
+ req.add_unredirected_header("Authorization", "Bearer %s" % auth_content)
def _send_batch(base_url, auth_file, batch, region):
- url = urljoin(base_url, 'upload')
+ url = urljoin(base_url, "upload")
if region is not None:
url += "?region=" + region
+ data = json.dumps(batch)
if PY3:
- data = to_binary(json.dumps(batch))
- else:
- data = json.dumps(batch)
- req = Request(url, data, {'Content-Type': 'application/json'})
+ data = data.encode("utf-8")
+ req = Request(url, data, {"Content-Type": "application/json"})
_authorize(req, auth_file)
try:
resp = urllib2.urlopen(req)
except (URLError, HTTPError) as e:
_log_api_error(e)
return None
- return json.load(resp)['result']
+ return json.load(resp)["result"]
def _s3_upload(filename, file):
# urllib2 does not support streaming, so we fall back to good old httplib
- url = urlparse(file['put_url'])
- cls = HTTPSConnection if url.scheme == 'https' else HTTPConnection
- host, port = url.netloc.split(':') if ':' in url.netloc else (url.netloc, 443)
+ url = urlparse(file["put_url"])
+ cls = HTTPSConnection if url.scheme == "https" else HTTPConnection
+ host, port = url.netloc.split(":") if ":" in url.netloc else (url.netloc, 443)
port = int(port)
conn = cls(host, port)
try:
req_path = "%s?%s" % (url.path, url.query) if url.query else url.path
- with open(filename, 'rb') as f:
+ with open(filename, "rb") as f:
content = f.read()
content_length = len(content)
f.seek(0)
conn.request(
- 'PUT',
+ "PUT",
req_path,
f,
{
- 'Content-Type': 'application/octet-stream',
- 'Content-Length': str(content_length),
+ "Content-Type": "application/octet-stream",
+ "Content-Length": str(content_length),
},
)
resp = conn.getresponse()
resp_body = resp.read()
conn.close()
if resp.status != 200:
- raise RuntimeError("Non-200 return from AWS: %s %s\n%s" %
- (resp.status, resp.reason, resp_body))
+ raise RuntimeError(
+ "Non-200 return from AWS: %s %s\n%s"
+ % (resp.status, resp.reason, resp_body)
+ )
except Exception:
- file['upload_exception'] = sys.exc_info()
- file['upload_ok'] = False
+ file["upload_exception"] = sys.exc_info()
+ file["upload_ok"] = False
else:
- file['upload_ok'] = True
+ file["upload_ok"] = True
def _notify_upload_complete(base_url, auth_file, file):
- req = Request(
- urljoin(
- base_url,
- 'upload/complete/%(algorithm)s/%(digest)s' % file))
+ req = Request(urljoin(base_url, "upload/complete/%(algorithm)s/%(digest)s" % file))
_authorize(req, auth_file)
try:
urllib2.urlopen(req)
@@ -1097,7 +1354,7 @@ def _notify_upload_complete(base_url, auth_file, file):
return
# 409 indicates that the upload URL hasn't expired yet and we
# should retry after a delay
- to_wait = int(e.headers.get('X-Retry-After', 60))
+ to_wait = int(e.headers.get("X-Retry-After", 60))
log.warning("Waiting %d seconds for upload URLs to expire" % to_wait)
time.sleep(to_wait)
_notify_upload_complete(base_url, auth_file, file)
@@ -1114,39 +1371,38 @@ def upload(manifest, message, base_urls, auth_file, region):
# verify the manifest, since we'll need the files present to upload
if not manifest.validate():
- log.error('manifest is invalid')
+ log.error("manifest is invalid")
return False
if any(fr.visibility is None for fr in manifest.file_records):
- log.error('All files in a manifest for upload must have a visibility set')
+ log.error("All files in a manifest for upload must have a visibility set")
# convert the manifest to an upload batch
batch = {
- 'message': message,
- 'files': {},
+ "message": message,
+ "files": {},
}
for fr in manifest.file_records:
- batch['files'][fr.filename] = {
- 'size': fr.size,
- 'digest': fr.digest,
- 'algorithm': fr.algorithm,
- 'visibility': fr.visibility,
+ batch["files"][fr.filename] = {
+ "size": fr.size,
+ "digest": fr.digest,
+ "algorithm": fr.algorithm,
+ "visibility": fr.visibility,
}
# make the upload request
resp = _send_batch(base_urls[0], auth_file, batch, region)
if not resp:
return None
- files = resp['files']
+ files = resp["files"]
# Upload the files, each in a thread. This allows us to start all of the
# uploads before any of the URLs expire.
threads = {}
for filename, file in files.items():
- if 'put_url' in file:
+ if "put_url" in file:
log.info("%s: starting upload" % (filename,))
- thd = threading.Thread(target=_s3_upload,
- args=(filename, file))
+ thd = threading.Thread(target=_s3_upload, args=(filename, file))
thd.daemon = 1
thd.start()
threads[filename] = thd
@@ -1161,11 +1417,12 @@ def upload(manifest, message, base_urls, auth_file, region):
# _s3_upload has annotated file with result information
file = files[filename]
thread.join()
- if file['upload_ok']:
+ if file["upload_ok"]:
log.info("%s: uploaded" % filename)
else:
- log.error("%s: failed" % filename,
- exc_info=file['upload_exception'])
+ log.error(
+ "%s: failed" % filename, exc_info=file["upload_exception"]
+ )
success = False
del threads[filename]
@@ -1173,54 +1430,120 @@ def upload(manifest, message, base_urls, auth_file, region):
# fails, we don't consider that an error (the server will notice
# eventually)
for filename, file in files.items():
- if 'put_url' in file and file['upload_ok']:
+ if "put_url" in file and file["upload_ok"]:
log.info("notifying server of upload completion for %s" % (filename,))
_notify_upload_complete(base_urls[0], auth_file, file)
return success
+def send_operation_on_file(data, base_urls, digest, auth_file):
+ url = base_urls[0]
+ url = urljoin(url, "file/sha512/" + digest)
+
+ data = json.dumps(data)
+
+ req = Request(url, data, {"Content-Type": "application/json"})
+ req.get_method = lambda: "PATCH"
+
+ _authorize(req, auth_file)
+
+ try:
+ urllib2.urlopen(req)
+ except (URLError, HTTPError) as e:
+ _log_api_error(e)
+ return False
+ return True
+
+
+def change_visibility(base_urls, digest, visibility, auth_file):
+ data = [
+ {
+ "op": "set_visibility",
+ "visibility": visibility,
+ }
+ ]
+ return send_operation_on_file(data, base_urls, digest, auth_file)
+
+
+def delete_instances(base_urls, digest, auth_file):
+ data = [
+ {
+ "op": "delete_instances",
+ }
+ ]
+ return send_operation_on_file(data, base_urls, digest, auth_file)
+
+
def process_command(options, args):
- """ I know how to take a list of program arguments and
+ """I know how to take a list of program arguments and
start doing the right thing with them"""
cmd = args[0]
cmd_args = args[1:]
- log.debug("processing '%s' command with args '%s'" %
- (cmd, '", "'.join(cmd_args)))
+ log.debug("processing '%s' command with args '%s'" % (cmd, '", "'.join(cmd_args)))
log.debug("using options: %s" % options)
- if cmd == 'list':
- return list_manifest(options['manifest'])
- if cmd == 'validate':
- return validate_manifest(options['manifest'])
- elif cmd == 'add':
- return add_files(options['manifest'], options['algorithm'], cmd_args,
- options['version'], options['visibility'],
- options['unpack'])
- elif cmd == 'purge':
- if options['cache_folder']:
- purge(folder=options['cache_folder'], gigs=options['size'])
- else:
- log.critical('please specify the cache folder to be purged')
- return False
- elif cmd == 'fetch':
- return fetch_files(
- options['manifest'],
- options['base_url'],
+ if cmd == "list":
+ return list_manifest(options["manifest"])
+ if cmd == "validate":
+ return validate_manifest(options["manifest"])
+ elif cmd == "add":
+ return add_files(
+ options["manifest"],
+ options["algorithm"],
cmd_args,
- cache_folder=options['cache_folder'],
+ options["version"],
+ options["visibility"],
+ options["unpack"],
+ )
+ elif cmd == "purge":
+ if options["cache_folder"]:
+ purge(folder=options["cache_folder"], gigs=options["size"])
+ else:
+ log.critical("please specify the cache folder to be purged")
+ return False
+ elif cmd == "fetch":
+ return fetch_files(
+ options["manifest"],
+ options["base_url"],
+ cmd_args,
+ cache_folder=options["cache_folder"],
auth_file=options.get("auth_file"),
- region=options.get('region'))
- elif cmd == 'upload':
- if not options.get('message'):
- log.critical('upload command requires a message')
+ region=options.get("region"),
+ )
+ elif cmd == "upload":
+ if not options.get("message"):
+ log.critical("upload command requires a message")
return False
return upload(
- options.get('manifest'),
- options.get('message'),
- options.get('base_url'),
- options.get('auth_file'),
- options.get('region'))
+ options.get("manifest"),
+ options.get("message"),
+ options.get("base_url"),
+ options.get("auth_file"),
+ options.get("region"),
+ )
+ elif cmd == "change-visibility":
+ if not options.get("digest"):
+ log.critical("change-visibility command requires a digest option")
+ return False
+ if not options.get("visibility"):
+ log.critical("change-visibility command requires a visibility option")
+ return False
+ return change_visibility(
+ options.get("base_url"),
+ options.get("digest"),
+ options.get("visibility"),
+ options.get("auth_file"),
+ )
+ elif cmd == "delete":
+ if not options.get("digest"):
+ log.critical("change-visibility command requires a digest option")
+ return False
+ return delete_instances(
+ options.get("base_url"),
+ options.get("digest"),
+ options.get("auth_file"),
+ )
else:
log.critical('command "%s" is not implemented' % cmd)
return False
@@ -1229,62 +1552,127 @@ def process_command(options, args):
def main(argv, _skip_logging=False):
# Set up option parsing
parser = optparse.OptionParser()
- parser.add_option('-q', '--quiet', default=logging.INFO,
- dest='loglevel', action='store_const', const=logging.ERROR)
- parser.add_option('-v', '--verbose',
- dest='loglevel', action='store_const', const=logging.DEBUG)
- parser.add_option('-m', '--manifest', default=DEFAULT_MANIFEST_NAME,
- dest='manifest', action='store',
- help='specify the manifest file to be operated on')
- parser.add_option('-d', '--algorithm', default='sha512',
- dest='algorithm', action='store',
- help='hashing algorithm to use (only sha512 is allowed)')
- parser.add_option('--visibility', default=None,
- dest='visibility', choices=['internal', 'public'],
- help='Visibility level of this file; "internal" is for '
- 'files that cannot be distributed out of the company '
- 'but not for secrets; "public" files are available to '
- 'anyone without restriction')
- parser.add_option('--unpack', default=False,
- dest='unpack', action='store_true',
- help='Request unpacking this file after fetch.'
- ' This is helpful with tarballs.')
- parser.add_option('--version', default=None,
- dest='version', action='store',
- help='Version string for this file. This annotates the '
- 'manifest entry with a version string to help '
- 'identify the contents.')
- parser.add_option('-o', '--overwrite', default=False,
- dest='overwrite', action='store_true',
- help='UNUSED; present for backward compatibility')
- parser.add_option('--url', dest='base_url', action='append',
- help='RelengAPI URL ending with /tooltool/; default '
- 'is appropriate for Mozilla')
- parser.add_option('-c', '--cache-folder', dest='cache_folder',
- help='Local cache folder')
- parser.add_option('-s', '--size',
- help='free space required (in GB)', dest='size',
- type='float', default=0.)
- parser.add_option('-r', '--region', help='Preferred AWS region for upload or fetch; '
- 'example: --region=us-west-2')
- parser.add_option('--message',
- help='The "commit message" for an upload; format with a bug number '
- 'and brief comment',
- dest='message')
- parser.add_option('--authentication-file',
- help='Use the RelengAPI token found in the given file to '
- 'authenticate to the RelengAPI server.',
- dest='auth_file')
+ parser.add_option(
+ "-q",
+ "--quiet",
+ default=logging.INFO,
+ dest="loglevel",
+ action="store_const",
+ const=logging.ERROR,
+ )
+ parser.add_option(
+ "-v", "--verbose", dest="loglevel", action="store_const", const=logging.DEBUG
+ )
+ parser.add_option(
+ "-m",
+ "--manifest",
+ default=DEFAULT_MANIFEST_NAME,
+ dest="manifest",
+ action="store",
+ help="specify the manifest file to be operated on",
+ )
+ parser.add_option(
+ "-d",
+ "--algorithm",
+ default="sha512",
+ dest="algorithm",
+ action="store",
+ help="hashing algorithm to use (only sha512 is allowed)",
+ )
+ parser.add_option(
+ "--digest",
+ default=None,
+ dest="digest",
+ action="store",
+ help="digest hash to change visibility for",
+ )
+ parser.add_option(
+ "--visibility",
+ default=None,
+ dest="visibility",
+ choices=["internal", "public"],
+ help='Visibility level of this file; "internal" is for '
+ "files that cannot be distributed out of the company "
+ 'but not for secrets; "public" files are available to '
+ "anyone without restriction",
+ )
+ parser.add_option(
+ "--unpack",
+ default=False,
+ dest="unpack",
+ action="store_true",
+ help="Request unpacking this file after fetch."
+ " This is helpful with tarballs.",
+ )
+ parser.add_option(
+ "--version",
+ default=None,
+ dest="version",
+ action="store",
+ help="Version string for this file. This annotates the "
+ "manifest entry with a version string to help "
+ "identify the contents.",
+ )
+ parser.add_option(
+ "-o",
+ "--overwrite",
+ default=False,
+ dest="overwrite",
+ action="store_true",
+ help="UNUSED; present for backward compatibility",
+ )
+ parser.add_option(
+ "--url",
+ dest="base_url",
+ action="append",
+ help="RelengAPI URL ending with /tooltool/; default "
+ "is appropriate for Mozilla",
+ )
+ parser.add_option(
+ "-c", "--cache-folder", dest="cache_folder", help="Local cache folder"
+ )
+ parser.add_option(
+ "-s",
+ "--size",
+ help="free space required (in GB)",
+ dest="size",
+ type="float",
+ default=0.0,
+ )
+ parser.add_option(
+ "-r",
+ "--region",
+ help="Preferred AWS region for upload or fetch; " "example: --region=us-west-2",
+ )
+ parser.add_option(
+ "--message",
+ help='The "commit message" for an upload; format with a bug number '
+ "and brief comment",
+ dest="message",
+ )
+ parser.add_option(
+ "--authentication-file",
+ help="Use the RelengAPI token found in the given file to "
+ "authenticate to the RelengAPI server.",
+ dest="auth_file",
+ )
(options_obj, args) = parser.parse_args(argv[1:])
- # default the options list if not provided
if not options_obj.base_url:
- options_obj.base_url = ['https://tooltool.mozilla-releng.net/']
+ tooltool_host = os.environ.get("TOOLTOOL_HOST", "tooltool.mozilla-releng.net")
+ taskcluster_proxy_url = os.environ.get("TASKCLUSTER_PROXY_URL")
+ if taskcluster_proxy_url:
+ tooltool_url = "{}/{}".format(taskcluster_proxy_url, tooltool_host)
+ else:
+ tooltool_url = "https://{}".format(tooltool_host)
+
+ options_obj.base_url = [tooltool_url]
# ensure all URLs have a trailing slash
def add_slash(url):
- return url if url.endswith('/') else (url + '/')
+ return url if url.endswith("/") else (url + "/")
+
options_obj.base_url = [add_slash(u) for u in options_obj.base_url]
# expand ~ in --authentication-file
@@ -1294,7 +1682,7 @@ def main(argv, _skip_logging=False):
# Dictionaries are easier to work with
options = vars(options_obj)
- log.setLevel(options['loglevel'])
+ log.setLevel(options["loglevel"])
# Set up logging, for now just to the console
if not _skip_logging: # pragma: no cover
@@ -1303,11 +1691,11 @@ def main(argv, _skip_logging=False):
ch.setFormatter(cf)
log.addHandler(ch)
- if options['algorithm'] != 'sha512':
- parser.error('only --algorithm sha512 is supported')
+ if options["algorithm"] != "sha512":
+ parser.error("only --algorithm sha512 is supported")
if len(args) < 1:
- parser.error('You must specify a command')
+ parser.error("You must specify a command")
return 0 if process_command(options, args) else 1
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/error.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/error.py
index 1b65d225fae..81910a63eb2 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/error.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/error.py
@@ -39,6 +39,10 @@ class NoSuchFrameException(BidiException):
error_code = "no such frame"
+class NoSuchNodeException(BidiException):
+ error_code = "no such node"
+
+
class NoSuchScriptException(BidiException):
error_code = "no such script"
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py
index 033929d5ff5..abaf569f928 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py
@@ -1,5 +1,5 @@
import base64
-from typing import Any, Optional, Mapping, MutableMapping
+from typing import Any, List, Mapping, MutableMapping, Optional
from ._module import BidiModule, command
@@ -80,3 +80,41 @@ class BrowsingContext(BidiModule):
assert isinstance(result["url"], str)
return result
+
+ @command
+ def print(
+ self,
+ context: str,
+ background: Optional[bool] = None,
+ margin: Optional[Mapping[str, Any]] = None,
+ orientation: Optional[str] = None,
+ page: Optional[Mapping[str, Any]] = None,
+ page_ranges: Optional[List[str]] = None,
+ scale: Optional[float] = None,
+ shrink_to_fit: Optional[bool] = None
+ ) -> Mapping[str, Any]:
+ params: MutableMapping[str, Any] = {
+ "context": context
+ }
+
+ if background is not None:
+ params["background"] = background
+ if margin is not None:
+ params["margin"] = margin
+ if orientation is not None:
+ params["orientation"] = orientation
+ if page is not None:
+ params["page"] = page
+ if page_ranges is not None:
+ params["pageRanges"] = page_ranges
+ if scale is not None:
+ params["scale"] = scale
+ if shrink_to_fit is not None:
+ params["shrinkToFit"] = shrink_to_fit
+
+ return params
+
+ @print.result
+ def _print(self, result: Mapping[str, Any]) -> Any:
+ assert result["data"] is not None
+ return result["data"]
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index ba01e1fe866..851c6722fc2 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -807,13 +807,12 @@ class Element:
"""
identifier = "element-6066-11e4-a52e-4f735466cecf"
- def __init__(self, id, session):
+ def __init__(self, session, id):
"""
Construct a new web element representation.
- :param id: Web element UUID which must be unique across
- all browsing contexts.
:param session: Current ``webdriver.Session``.
+ :param id: Web element UUID which must be unique across all browsing contexts.
"""
self.id = id
self.session = session
@@ -828,7 +827,7 @@ class Element:
@classmethod
def from_json(cls, json, session):
uuid = json[Element.identifier]
- return cls(uuid, session)
+ return cls(session, uuid)
def send_element_command(self, method, uri, body=None):
url = "element/%s/%s" % (self.id, uri)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
index 93e2a87826c..78e05264d4d 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
@@ -164,10 +164,8 @@ class TagFilter:
def __init__(self, tags):
self.tags = set(tags)
- def __call__(self, test_iter):
- for test in test_iter:
- if test.tags & self.tags:
- yield test
+ def __call__(self, test):
+ return test.tags & self.tags
class ManifestLoader:
@@ -214,6 +212,7 @@ class TestLoader:
test_types,
run_info,
manifest_filters=None,
+ test_filters=None,
chunk_type="none",
total_chunks=1,
chunk_number=1,
@@ -228,6 +227,7 @@ class TestLoader:
self.run_info = run_info
self.manifest_filters = manifest_filters if manifest_filters is not None else []
+ self.test_filters = test_filters if test_filters is not None else []
self.manifests = test_manifests
self.tests = None
@@ -310,7 +310,9 @@ class TestLoader:
inherit_metadata, test_metadata = self.load_metadata(manifest_file, metadata_path, test_path)
for test in tests:
- yield test_path, test_type, self.get_test(manifest_file, test, inherit_metadata, test_metadata)
+ wpt_test = self.get_test(manifest_file, test, inherit_metadata, test_metadata)
+ if all(f(wpt_test) for f in self.test_filters):
+ yield test_path, test_type, wpt_test
def _load_tests(self):
"""Read in the tests from the manifest file and add them to a queue"""
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py
index 0936c54ea97..8c8d02a22b9 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py
@@ -7,7 +7,7 @@ import tempfile
import pytest
from mozlog import structured
-from ..testloader import TestFilter as Filter, TestLoader as Loader
+from ..testloader import TestFilter, TestLoader, TagFilter
from ..testloader import read_include_from_file
from .test_wpttest import make_mock_manifest
@@ -46,19 +46,20 @@ def test_loader_h2_tests():
manifest = WPTManifest.from_json("/", manifest_json)
# By default, the loader should include the h2 test.
- loader = Loader({manifest: {"metadata_path": ""}}, ["testharness"], None)
+ loader = TestLoader({manifest: {"metadata_path": ""}}, ["testharness"], None)
assert "testharness" in loader.tests
assert len(loader.tests["testharness"]) == 2
assert len(loader.disabled_tests) == 0
# We can also instruct it to skip them.
- loader = Loader({manifest: {"metadata_path": ""}}, ["testharness"], None, include_h2=False)
+ loader = TestLoader({manifest: {"metadata_path": ""}}, ["testharness"], None, include_h2=False)
assert "testharness" in loader.tests
assert len(loader.tests["testharness"]) == 1
assert "testharness" in loader.disabled_tests
assert len(loader.disabled_tests["testharness"]) == 1
assert loader.disabled_tests["testharness"][0].url == "/a/bar.h2.html"
+
@pytest.mark.xfail(sys.platform == "win32",
reason="NamedTemporaryFile cannot be reopened on Win32")
def test_include_file():
@@ -82,6 +83,7 @@ def test_include_file():
assert "/foo/idlharness.https.any.html" in include
assert "/foo/idlharness.https.any.worker.html" in include
+
@pytest.mark.xfail(sys.platform == "win32",
reason="NamedTemporaryFile cannot be reopened on Win32")
def test_filter_unicode():
@@ -92,4 +94,44 @@ def test_filter_unicode():
f.write(include_ini.encode('utf-8'))
f.flush()
- Filter(manifest_path=f.name, test_manifests=tests)
+ TestFilter(manifest_path=f.name, test_manifests=tests)
+
+
+def test_loader_filter_tags():
+ manifest_json = {
+ "items": {
+ "testharness": {
+ "a": {
+ "foo.html": [
+ "abcdef123456",
+ [None, {}],
+ ],
+ "bar.html": [
+ "uvwxyz987654",
+ [None, {}],
+ ],
+ }
+ }
+ },
+ "url_base": "/",
+ "version": 8,
+ }
+ manifest = WPTManifest.from_json("/", manifest_json)
+
+ tmpdir_kwargs = {}
+ if sys.version_info.major >= 3 and sys.version_info.minor >= 10:
+ tmpdir_kwargs["ignore_cleanup_errors"] = True
+ with tempfile.TemporaryDirectory(**tmpdir_kwargs) as metadata_path:
+ a_path = os.path.join(metadata_path, "a")
+ os.makedirs(a_path)
+ with open(os.path.join(a_path, "bar.html.ini"), "w") as f:
+ f.write("tags: [test-include]\n")
+
+ loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None)
+ assert len(loader.tests["testharness"]) == 2
+
+ loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None,
+ test_filters=[TagFilter({"test-include"})])
+ assert len(loader.tests["testharness"]) == 1
+ assert loader.tests["testharness"][0].id == "/a/bar.html"
+ assert loader.tests["testharness"][0].tags == {"dir:a", "test-include"}
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index 224a4fde4df..740bb7e9f42 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -62,10 +62,12 @@ def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kw
device_serials=kwargs.get("device_serial"),
adb_binary=kwargs.get("adb_binary"))
- test_manifests = testloader.ManifestLoader(test_paths, force_manifest_update=kwargs["manifest_update"],
+ test_manifests = testloader.ManifestLoader(test_paths,
+ force_manifest_update=kwargs["manifest_update"],
manifest_download=kwargs["manifest_download"]).load()
manifest_filters = []
+ test_filters = []
include = kwargs["include"]
if kwargs["include_file"]:
@@ -74,6 +76,9 @@ def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kw
if test_groups:
include = testloader.update_include_for_groups(test_groups, include)
+ if kwargs["tags"]:
+ test_filters.append(testloader.TagFilter(kwargs["tags"]))
+
if include or kwargs["exclude"] or kwargs["include_manifest"] or kwargs["default_exclude"]:
manifest_filters.append(testloader.TestFilter(include=include,
exclude=kwargs["exclude"],
@@ -87,6 +92,7 @@ def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kw
kwargs["test_types"],
run_info,
manifest_filters=manifest_filters,
+ test_filters=test_filters,
chunk_type=kwargs["chunk_type"],
total_chunks=kwargs["total_chunks"],
chunk_number=kwargs["this_chunk"],
diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/requestStorageAccessForOrigin.sub.https.window.js b/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/requestStorageAccessForOrigin.sub.https.window.js
index 76e5bf83b1e..6fff9e9189e 100644
--- a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/requestStorageAccessForOrigin.sub.https.window.js
+++ b/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/requestStorageAccessForOrigin.sub.https.window.js
@@ -58,6 +58,7 @@ test(
promise_setup(async () => {
await test_driver.set_permission(
{ name: 'top-level-storage-access', requestedOrigin }, 'prompt');
+ await test_driver.set_permission({name: 'storage-access'}, 'prompt');
});
promise_test(
@@ -110,6 +111,29 @@ if (topLevelDocument) {
'[' + testPrefix +
'] document.requestStorageAccessForOrigin() should be resolved without a user gesture with an existing permission');
+ promise_test(
+ async t => {
+ const altOrigin = 'https://{{hosts[alt][www]}}:{{ports[https][0]}}';
+ t.add_cleanup(async () => {
+ await test_driver.set_permission(
+ {name: 'top-level-storage-access', requestedOrigin: altOrigin},
+ 'prompt');
+ await test_driver.set_permission({name: 'storage-access'}, 'prompt');
+ });
+ await test_driver.set_permission(
+ {name: 'top-level-storage-access', requestedOrigin: altOrigin},
+ 'granted');
+
+ await RunCallbackWithGesture(() => {
+ document.requestStorageAccessForOrigin(altOrigin).then(() => {
+ RunTestsInIFrame(
+ 'https://{{hosts[alt][www]}}:{{ports[https][0]}}/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html');
+ });
+ });
+ },
+ '[' + testPrefix +
+ '] document.requestStorageAccess() should be resolved without a user gesture after a successful requestStorageAccessForOrigin() call');
+
// Create a test with a single-child same-origin iframe.
// This will validate that calls to requestStorageAccessForOrigin are rejected
// in non-top-level contexts.
diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html b/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html
new file mode 100644
index 00000000000..f4db5cf65ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/wai-aria/README.md b/tests/wpt/web-platform-tests/wai-aria/manual/README.md
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/README.md
rename to tests/wpt/web-platform-tests/wai-aria/manual/README.md
diff --git a/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/alertdialog_modal_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/alertdialog_modal_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/alertdialog_modal_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/alertdialog_modal_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/application_activedescendant-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/application_activedescendant-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/application_activedescendant-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/application_activedescendant-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/application_activedescendant_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/application_activedescendant_value_changes-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/application_activedescendant_value_changes-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/application_activedescendant_value_changes-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_not_declared-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_not_declared-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_not_declared-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_not_declared-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_changes-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_changes-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_changes-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_date-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_date-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_date-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_date-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_location-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_location-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_location-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_location-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_page-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_page-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_page-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_page-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_step-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_step-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_step-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_step-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_time-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_time-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_time-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_time-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_details_element-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-details_pointing_to_details_element-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_details_element-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-details_pointing_to_details_element-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_div_element-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/aria-details_pointing_to_div_element-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_div_element-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/aria-details_pointing_to_div_element-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/article_in_feed_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/article_in_feed_posinset_and_setsize-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/article_in_feed_posinset_and_setsize-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/article_in_feed_posinset_and_setsize-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/article_in_feed_setsize_-1-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/article_in_feed_setsize_-1-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/article_in_feed_setsize_-1-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/article_in_feed_setsize_-1-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/article_not_in_feed_posinset_and_setsize-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/article_not_in_feed_posinset_and_setsize-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_dialog-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_dialog-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_dialog-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_dialog-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_emptystring-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_emptystring-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_emptystring-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_emptystring-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_foo-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_foo-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_foo-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_foo-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_grid-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_grid-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_grid-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_grid-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_listbox-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_listbox-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_listbox-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_listbox-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_menu-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_menu-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_menu-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_menu-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_tree-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_tree-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_tree-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_tree-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_haspopup_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_empty-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_empty-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_roledescription_empty-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_empty-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_valid-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_valid-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_roledescription_valid-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_valid-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_whitespace_only-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_whitespace_only-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/button_roledescription_whitespace_only-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_whitespace_only-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_div-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_div-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_div-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_div-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_div-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_div-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_colindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_colindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_colindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/cell_rowindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/cell_rowindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/cell_rowindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_div-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_div-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_div-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_div-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_div-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_colindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_colindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_colindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_rowindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_rowindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_rowindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_selected_false_not_automatically_propagated-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_selected_false_not_automatically_propagated-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_selected_true_not_automatically_propagated-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/columnheader_selected_true_not_automatically_propagated-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_controls_an_invalid_id-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_controls_an_invalid_id-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_controls_an_invalid_id-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_controls_an_invalid_id-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_dialog-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_dialog-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_dialog-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_dialog-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_grid-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_grid-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_grid-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_grid-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_listbox-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_listbox-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_listbox-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_listbox-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_menu-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_menu-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_menu-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_menu-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_tree-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_tree-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_tree-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_tree-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/combobox_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/dialog_modal_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/dialog_modal_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/div_element_without_role_roledescription_valid-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/div_element_without_role_roledescription_valid-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/div_element_without_role_roledescription_valid-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/div_element_without_role_roledescription_valid-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_invalid_state-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/errormessage_object_in_invalid_state-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_invalid_state-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/errormessage_object_in_invalid_state-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_valid_state-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/errormessage_object_in_valid_state-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_valid_state-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/errormessage_object_in_valid_state-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/feed-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/feed-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/feed-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/feed-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/figure-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/figure-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/figure-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/figure-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_aria-readonly_false_automatically_propagated-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_aria-readonly_false_automatically_propagated-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_aria-readonly_true_automatically_propagated-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_aria-readonly_true_automatically_propagated-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_busy_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_busy_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_busy_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_busy_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_busy_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_value_changes-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_busy_value_changes-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_value_changes-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_colcount_8-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_colcount_8-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_colcount_8-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_colcount_8-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowcount_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowcount_3-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_rowcount_3-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_rowcount_3-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-colspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/gridcell_aria-colspan_2_on_div-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/gridcell_aria-colspan_2_on_div-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/gridcell_aria-colspan_2_on_div-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/gridcell_aria-rowspan_2_on_div-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/gridcell_aria-rowspan_2_on_div-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/gridcell_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/gridcell_colindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/gridcell_colindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/gridcell_colindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/gridcell_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/gridcell_rowindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/gridcell_rowindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/gridcell_rowindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_not_rendered-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/group_hidden_undefined_element_not_rendered-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_not_rendered-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/group_hidden_undefined_element_not_rendered-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_rendered-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/group_hidden_undefined_element_rendered-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_rendered-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/group_hidden_undefined_element_rendered-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/heading_level_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/heading_level_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/heading_level_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/heading_level_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_multiple_shortcuts-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/keyshortcuts_multiple_shortcuts-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/keyshortcuts_multiple_shortcuts-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/keyshortcuts_multiple_shortcuts-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_one_shortcut-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/keyshortcuts_one_shortcut-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/keyshortcuts_one_shortcut-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/keyshortcuts_one_shortcut-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_busy_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listbox_busy_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listbox_busy_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listbox_busy_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_busy_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listbox_busy_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listbox_busy_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listbox_busy_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listbox_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listbox_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listbox_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listbox_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listbox_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listbox_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/listitem_setsize_-1-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/listitem_setsize_-1-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/listitem_setsize_-1-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/listitem_setsize_-1-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menu_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menu_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menu_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_busy_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menubar_busy_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menubar_busy_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menubar_busy_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_busy_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menubar_busy_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menubar_busy_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menubar_busy_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menubar_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menubar_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menubar_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitem_expanded_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitem_expanded_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitem_expanded_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitem_expanded_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitem_expanded_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitem_expanded_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitem_expanded_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitem_expanded_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitem_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitem_posinset_and_setsize-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitem_posinset_and_setsize-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitem_posinset_and_setsize-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_expanded_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_expanded_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_expanded_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_expanded_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_expanded_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_expanded_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_expanded_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_expanded_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_posinset_and_setsize-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_posinset_and_setsize-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_expanded_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_expanded_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemradio_expanded_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_expanded_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_expanded_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_expanded_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemradio_expanded_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_expanded_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_posinset_and_setsize-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemradio_posinset_and_setsize-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_posinset_and_setsize-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/none-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/none-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/none-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/none-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/option_selected_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/option_selected_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/option_selected_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/option_selected_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/option_selected_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/option_selected_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/option_selected_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/option_selected_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/option_selected_undefined-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/option_selected_undefined-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/option_selected_undefined-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/option_selected_undefined-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/option_selected_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/option_selected_value_changes-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/option_selected_value_changes-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/option_selected_value_changes-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/region_with_name-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/region_with_name-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/region_with_name-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/region_with_name-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/region_without_name-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/region_without_name-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/region_without_name-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/region_without_name-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/row_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/row_colindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/row_colindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/row_colindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/row_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/row_rowindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/row_rowindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/row_rowindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-colspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_aria-colspan_2_on_div-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/rowheader_aria-colspan_2_on_div-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/rowheader_aria-colspan_2_on_div-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_aria-rowspan_2_on_div-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/rowheader_aria-rowspan_2_on_div-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_colindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/rowheader_colindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/rowheader_colindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_rowindex_4-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/rowheader_rowindex_4-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/rowheader_rowindex_4-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_selected_false_not_automatically_propagated-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/rowheader_selected_false_not_automatically_propagated-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_selected_true_not_automatically_propagated-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/rowheader_selected_true_not_automatically_propagated-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/scrollbar_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_all_values_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/scrollbar_all_values_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_all_values_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/scrollbar_only_valuenow_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_only_valuenow_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/scrollbar_only_valuenow_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_only_valuenow_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/scrollbar_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/scrollbar_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_activedescendant-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_activedescendant-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_activedescendant_value_changes-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant_value_changes-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_activedescendant_value_changes-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_both-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_both-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_both-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_both-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_inline-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_inline-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_inline-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_inline-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_list-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_list-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_list-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_list-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_none-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_none-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_none-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_none-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_placeholder-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_placeholder-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_placeholder-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_placeholder-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_required_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_required_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/searchbox_required_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_all_values_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/separator_focusable_all_values_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_all_values_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_only_valuenow_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_only_valuenow_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_valuetext-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_valuetext-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/separator_focusable_valuetext-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_valuetext-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/separator_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/separator_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/separator_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/separator_unfocusable_all_values_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_all_values_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/separator_unfocusable_all_values_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_valuetext-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/separator_unfocusable_valuetext-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_valuetext-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/separator_unfocusable_valuetext-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/slider_all_values_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/slider_all_values_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/slider_all_values_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_only_valuenow_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/slider_only_valuenow_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/slider_only_valuenow_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/slider_only_valuenow_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/slider_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/slider_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/slider_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/slider_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/slider_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/slider_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_all_values_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/spinbutton_all_values_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_all_values_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_only_aria-valuenow_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_only_aria-valuenow_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/switch_checked_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_mixed-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_mixed-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/switch_checked_mixed-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_mixed-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/switch_checked_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_undefined-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_undefined-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/switch_checked_undefined-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_undefined-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_value_changes-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/switch_checked_value_changes-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_value_changes-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/switch_readonly_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/switch_readonly_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/switch_readonly_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/tab_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/tab_posinset_and_setsize-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/tab_posinset_and_setsize-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/tab_posinset_and_setsize-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/table_colcount_-1-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/table_colcount_-1-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/table_colcount_-1-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/table_colcount_-1-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/table_colcount_8-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/table_colcount_8-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/table_colcount_8-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/table_colcount_8-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/table_rowcount_-1-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/table_rowcount_-1-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/table_rowcount_-1-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/table_rowcount_-1-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/table_rowcount_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/table_rowcount_3-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/table_rowcount_3-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/table_rowcount_3-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/tablist_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/tablist_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/tablist_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/term_role-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/term_role-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/term_role-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/term_role-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/textbox_placeholder-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/textbox_placeholder-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/textbox_placeholder-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/textbox_placeholder-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/tree_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/tree_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/tree_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_colcount_8-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_colcount_8-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treegrid_colcount_8-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treegrid_colcount_8-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_horizontal-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_horizontal-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_horizontal-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_unspecified-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_unspecified-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_unspecified-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_vertical-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_vertical-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_vertical-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_rowcount_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_rowcount_3-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treegrid_rowcount_3-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treegrid_rowcount_3-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_false-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treeitem_selected_false-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_false-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_true-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treeitem_selected_true-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_true-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_undefined-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_undefined-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treeitem_selected_undefined-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_undefined-manual.html
diff --git a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_value_changes-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/wai-aria/treeitem_selected_value_changes-manual.html
rename to tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_value_changes-manual.html
diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-prf.https.html b/tests/wpt/web-platform-tests/webauthn/getcredential-prf.https.html
index 61b52ac5958..40dfc5cad33 100644
--- a/tests/wpt/web-platform-tests/webauthn/getcredential-prf.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/getcredential-prf.https.html
@@ -116,13 +116,21 @@ standardSetup(async function(authenticator) {
byCred["Zm9v"] = {
first: new Uint8Array([1,2,3,4]).buffer,
};
- const assertion = await assert(id, {
+ return promise_rejects_dom(t, "SyntaxError", assert(id, {
evalByCredential: byCred,
- });
- assert_own_property(assertion.getClientExtensionResults(), 'prf');
- assert_not_own_property(assertion.getClientExtensionResults().prf,
- 'results');
- }, "navigator.credentials.get() using wrong credential ID");
+ }));
+ }, "navigator.credentials.get() with credential ID not in allowedCredentials");
+
+ promise_test(async t => {
+ const id = (await credential).rawId;
+ const byCred = {};
+ byCred["Zm9v"] = {
+ first: new Uint8Array([1,2,3,4]),
+ };
+ return promise_rejects_dom(t, "SyntaxError", assert(id, {
+ evalByCredential: byCred,
+ }));
+ }, "navigator.credentials.get() with Uint8Array credential ID not in allowedCredentials");
promise_test(async t => {
const id = (await credential).rawId;
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/__init__.py
new file mode 100644
index 00000000000..d34fef9869a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/__init__.py
@@ -0,0 +1,6 @@
+import pytest
+
+
+def assert_pdf(data):
+ assert data.startswith(b"%PDF-"), "Decoded data starts with the PDF signature"
+ assert data.endswith(b"%%EOF\n"), "Decoded data ends with the EOF flag"
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/context.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/context.py
new file mode 100644
index 00000000000..a73bfee9621
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/context.py
@@ -0,0 +1,26 @@
+from base64 import decodebytes
+
+import pytest
+
+from . import assert_pdf
+from ... import recursive_compare
+
+pytestmark = pytest.mark.asyncio
+
+
+async def test_context(bidi_session, top_context, inline, get_pdf_content):
+ text = "Test"
+ url = inline(text)
+ await bidi_session.browsing_context.navigate(
+ context=top_context["context"], url=url, wait="complete"
+ )
+
+ value = await bidi_session.browsing_context.print(context=top_context["context"])
+ pdf = decodebytes(value.encode())
+
+ assert_pdf(pdf)
+
+ pdf_content = await get_pdf_content(value)
+ recursive_compare(
+ {"type": "array", "value": [{"type": "string", "value": text}]}, pdf_content
+ )
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/invalid.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/invalid.py
new file mode 100644
index 00000000000..114aeb62dcc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/invalid.py
@@ -0,0 +1,197 @@
+import pytest
+import webdriver.bidi.error as error
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize("context", [None, False, 42, {}, []])
+async def test_params_context_invalid_type(bidi_session, context):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(context=context)
+
+
+async def test_params_context_invalid_value(bidi_session):
+ with pytest.raises(error.NoSuchFrameException):
+ await bidi_session.browsing_context.print(context="_invalid_")
+
+
+async def test_params_context_closed(bidi_session):
+ new_tab = await bidi_session.browsing_context.create(type_hint="tab")
+ await bidi_session.browsing_context.close(context=new_tab["context"])
+
+ # Try to print the closed context
+ with pytest.raises(error.NoSuchFrameException):
+ await bidi_session.browsing_context.print(context=new_tab["context"])
+
+
+@pytest.mark.parametrize("background", ["foo", 42, {}, []])
+async def test_params_background_invalid_type(bidi_session, top_context, background):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], background=background
+ )
+
+
+@pytest.mark.parametrize(
+ "margin",
+ [
+ False,
+ "foo",
+ 42,
+ [],
+ {"top": False},
+ {"top": "foo"},
+ {"top": []},
+ {"top": {}},
+ {"bottom": False},
+ {"bottom": "foo"},
+ {"bottom": []},
+ {"bottom": {}},
+ {"left": False},
+ {"left": "foo"},
+ {"left": []},
+ {"left": {}},
+ {"right": False},
+ {"right": "foo"},
+ {"right": []},
+ {"right": {}},
+ ],
+)
+async def test_params_margin_invalid_type(bidi_session, top_context, margin):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], margin=margin
+ )
+
+
+@pytest.mark.parametrize(
+ "margin",
+ [
+ {"top": -0.1},
+ {"bottom": -0.1},
+ {"left": -0.1},
+ {"right": -0.1},
+ ],
+)
+async def test_params_margin_invalid_value(bidi_session, top_context, margin):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], margin=margin
+ )
+
+
+@pytest.mark.parametrize("orientation", [False, 42, {}, []])
+async def test_params_orientation_invalid_type(bidi_session, top_context, orientation):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], orientation=orientation
+ )
+
+
+async def test_params_orientation_invalid_value(bidi_session, top_context):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], orientation="foo"
+ )
+
+
+@pytest.mark.parametrize(
+ "page",
+ [
+ False,
+ "foo",
+ 42,
+ [],
+ {"height": False},
+ {"height": "foo"},
+ {"height": []},
+ {"height": {}},
+ {"width": False},
+ {"width": "foo"},
+ {"width": []},
+ {"width": {}},
+ ],
+)
+async def test_params_page_invalid_type(bidi_session, top_context, page):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], page=page
+ )
+
+
+@pytest.mark.parametrize(
+ "page",
+ [
+ {"height": -1},
+ {"width": -1},
+ ],
+)
+async def test_params_page_invalid_value(bidi_session, top_context, page):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], page=page
+ )
+
+
+@pytest.mark.parametrize(
+ "page_ranges",
+ [
+ False,
+ "foo",
+ 42,
+ {},
+ [None],
+ [False],
+ [[]],
+ [{}],
+ ["1-2", {}],
+ ],
+)
+async def test_params_page_ranges_invalid_type(bidi_session, top_context, page_ranges):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], page_ranges=page_ranges
+ )
+
+@pytest.mark.parametrize(
+ "page_ranges",
+ [
+ [4.2],
+ ["4.2"],
+ ["3-2"],
+ ["a-2"],
+ ["1:2"],
+ ["1-2-3"],
+ ],
+)
+async def test_params_page_ranges_invalid_value(bidi_session, top_context, page_ranges):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], page_ranges=page_ranges
+ )
+
+
+@pytest.mark.parametrize("scale", [False, "foo", {}, []])
+async def test_params_scale_invalid_type(bidi_session, top_context, scale):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], scale=scale
+ )
+
+
+@pytest.mark.parametrize("scale", [-1, 0.09, 2.01, 42])
+async def test_params_scale_invalid_value(bidi_session, top_context, scale):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], scale=scale
+ )
+
+
+@pytest.mark.parametrize("shrink_to_fit", ["foo", 42, {}, []])
+async def test_params_shrink_to_fit_invalid_type(
+ bidi_session, top_context, shrink_to_fit
+):
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.browsing_context.print(
+ context=top_context["context"], shrink_to_fit=shrink_to_fit
+ )
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/page_ranges.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/page_ranges.py
new file mode 100644
index 00000000000..9e466883b0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/page_ranges.py
@@ -0,0 +1,140 @@
+# META: timeout=long
+from base64 import decodebytes
+
+import pytest
+
+from . import assert_pdf
+from ... import recursive_compare
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize(
+ "ranges,expected",
+ [
+ (
+ ["2-4"],
+ [
+ {"type": "string", "value": "Page 2"},
+ {"type": "string", "value": "Page 3"},
+ {"type": "string", "value": "Page 4"},
+ ],
+ ),
+ (
+ ["2-4", "2-3"],
+ [
+ {"type": "string", "value": "Page 2"},
+ {"type": "string", "value": "Page 3"},
+ {"type": "string", "value": "Page 4"},
+ ],
+ ),
+ (
+ ["2-4", "3-5"],
+ [
+ {"type": "string", "value": "Page 2"},
+ {"type": "string", "value": "Page 3"},
+ {"type": "string", "value": "Page 4"},
+ {"type": "string", "value": "Page 5"},
+ ],
+ ),
+ (
+ ["9-"],
+ [
+ {"type": "string", "value": "Page 9"},
+ {"type": "string", "value": "Page 10"},
+ ],
+ ),
+ (
+ ["-2"],
+ [
+ {"type": "string", "value": "Page 1"},
+ {"type": "string", "value": "Page 2"},
+ ],
+ ),
+ (
+ [7],
+ [
+ {"type": "string", "value": "Page 7"},
+ ],
+ ),
+ (
+ ["7"],
+ [
+ {"type": "string", "value": "Page 7"},
+ ],
+ ),
+ (
+ ["-2", "9-", "7"],
+ [
+ {"type": "string", "value": "Page 1"},
+ {"type": "string", "value": "Page 2"},
+ {"type": "string", "value": "Page 7"},
+ {"type": "string", "value": "Page 9"},
+ {"type": "string", "value": "Page 10"},
+ ],
+ ),
+ (
+ ["-5", "2-"],
+ [
+ {"type": "string", "value": "Page 1"},
+ {"type": "string", "value": "Page 2"},
+ {"type": "string", "value": "Page 3"},
+ {"type": "string", "value": "Page 4"},
+ {"type": "string", "value": "Page 5"},
+ {"type": "string", "value": "Page 6"},
+ {"type": "string", "value": "Page 7"},
+ {"type": "string", "value": "Page 8"},
+ {"type": "string", "value": "Page 9"},
+ {"type": "string", "value": "Page 10"},
+ ],
+ ),
+ (
+ [],
+ [
+ {"type": "string", "value": "Page 1"},
+ {"type": "string", "value": "Page 2"},
+ {"type": "string", "value": "Page 3"},
+ {"type": "string", "value": "Page 4"},
+ {"type": "string", "value": "Page 5"},
+ {"type": "string", "value": "Page 6"},
+ {"type": "string", "value": "Page 7"},
+ {"type": "string", "value": "Page 8"},
+ {"type": "string", "value": "Page 9"},
+ {"type": "string", "value": "Page 10"},
+ ],
+ ),
+ ],
+)
+async def test_page_ranges_document(
+ bidi_session, inline, top_context, get_pdf_content, ranges, expected
+):
+ url = inline(
+ """
+
+
+Page 1
+Page 2
+Page 3
+Page 4
+Page 5
+Page 6
+Page 7
+Page 8
+Page 9
+Page 10
"""
+ )
+ await bidi_session.browsing_context.navigate(
+ context=top_context["context"], url=url, wait="complete"
+ )
+
+ value = await bidi_session.browsing_context.print(
+ context=top_context["context"], page_ranges=ranges
+ )
+ pdf = decodebytes(value.encode())
+
+ assert_pdf(pdf)
+
+ pdf_content = await get_pdf_content(value)
+ recursive_compare({"type": "array", "value": expected}, pdf_content)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/arguments.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/arguments.py
index 9fbe5fb8110..daf31fc869c 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/arguments.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/arguments.py
@@ -1,37 +1,14 @@
import pytest
+import webdriver.bidi.error as error
from webdriver.bidi.modules.script import ContextTarget
-from ... import recursive_compare
-
-
-@pytest.mark.asyncio
-async def test_arguments(bidi_session, top_context):
- result = await bidi_session.script.call_function(
- function_declaration="(...args)=>{return args}",
- arguments=[{
- "type": "string",
- "value": "ARGUMENT_STRING_VALUE"
- }, {
- "type": "number",
- "value": 42}],
- await_promise=False,
- target=ContextTarget(top_context["context"]))
-
- recursive_compare({
- "type": "array",
- "value": [{
- "type": 'string',
- "value": 'ARGUMENT_STRING_VALUE'
- }, {
- "type": 'number',
- "value": 42}]},
- result)
+from ... import any_string, recursive_compare
@pytest.mark.asyncio
async def test_default_arguments(bidi_session, top_context):
result = await bidi_session.script.call_function(
- function_declaration="(...args)=>{return args}",
+ function_declaration="(...args) => args",
await_promise=False,
target=ContextTarget(top_context["context"]))
@@ -41,6 +18,121 @@ async def test_default_arguments(bidi_session, top_context):
}, result)
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+ "argument, expected",
+ [
+ ({"type": "undefined"}, "undefined"),
+ ({"type": "null"}, "null"),
+ ({"type": "string", "value": "foobar"}, "'foobar'"),
+ ({"type": "string", "value": "2"}, "'2'"),
+ ({"type": "number", "value": "-0"}, "-0"),
+ ({"type": "number", "value": "Infinity"}, "Infinity"),
+ ({"type": "number", "value": "-Infinity"}, "-Infinity"),
+ ({"type": "number", "value": 3}, "3"),
+ ({"type": "number", "value": 1.4}, "1.4"),
+ ({"type": "boolean", "value": True}, "true"),
+ ({"type": "boolean", "value": False}, "false"),
+ ({"type": "bigint", "value": "42"}, "42n"),
+ ],
+)
+async def test_primitive_value(bidi_session, top_context, argument, expected):
+ result = await bidi_session.script.call_function(
+ function_declaration=f"""(arg) => {{
+ if (arg !== {expected}) {{
+ throw new Error(`Argument should be {expected}, but was ` + arg);
+ }}
+ return arg;
+ }}""",
+ arguments=[argument],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+ recursive_compare(argument, result)
+
+
+@pytest.mark.asyncio
+async def test_primitive_value_NaN(bidi_session, top_context):
+ nan_remote_value = {"type": "number", "value": "NaN"}
+ result = await bidi_session.script.call_function(
+ function_declaration="""(arg) => {
+ if (!isNaN(arg)) {
+ throw new Error("Argument should be 'NaN', but was " + arg);
+ }
+ return arg;
+ }""",
+ arguments=[nan_remote_value],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+ recursive_compare(nan_remote_value, result)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+ "argument, expected_type",
+ [
+ ({
+ "type": "array",
+ "value": [
+ {"type": "string", "value": "foobar"},
+ ],
+ },
+ "Array"
+ ),
+ ({"type": "date", "value": "2022-05-31T13:47:29.000Z"},
+ "Date"
+ ),
+ ({
+ "type": "map",
+ "value": [
+ ["foobar", {"type": "string", "value": "foobar"}],
+ ],
+ },
+ "Map"
+ ),
+ ({
+ "type": "object",
+ "value": [
+ ["foobar", {"type": "string", "value": "foobar"}],
+ ],
+ },
+ "Object"
+ ),
+ ({"type": "regexp", "value": {"pattern": "foo", "flags": "g"}},
+ "RegExp"
+ ),
+ ({
+ "type": "set",
+ "value": [
+ {"type": "string", "value": "foobar"},
+ ],
+ },
+ "Set"
+ )
+ ],
+)
+async def test_local_value(bidi_session, top_context, argument, expected_type):
+ result = await bidi_session.script.call_function(
+ function_declaration=f"""(arg) => {{
+ if (!(arg instanceof {expected_type})) {{
+ const type = Object.prototype.toString.call(arg);
+ throw new Error(
+ "Argument type should be {expected_type}, but was " + type
+ );
+ }}
+ return arg;
+ }}""",
+ arguments=[argument],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+ recursive_compare(argument, result)
+
+
@pytest.mark.asyncio
@pytest.mark.parametrize(
"setup_expression, function_declaration, expected",
@@ -112,11 +204,6 @@ async def test_default_arguments(bidi_session, top_context):
"(func) => func()",
{"type": "boolean", "value": False},
),
- (
- "document.createElement('div')",
- "(node) => node.tagName",
- {"type": "string", "value": "DIV"},
- ),
(
"window.foo = 3; window",
"(window) => window.foo",
@@ -134,7 +221,7 @@ async def test_default_arguments(bidi_session, top_context):
),
],
)
-async def test_remote_value_argument(
+async def test_remote_reference_argument(
bidi_session, top_context, setup_expression, function_declaration, expected
):
remote_value_result = await bidi_session.script.evaluate(
@@ -157,116 +244,6 @@ async def test_remote_value_argument(
assert result == expected
-@pytest.mark.asyncio
-@pytest.mark.parametrize(
- "argument, expected",
- [
- ({"type": "undefined"}, "undefined"),
- ({"type": "null"}, "null"),
- ({"type": "string", "value": "foobar"}, "'foobar'"),
- ({"type": "string", "value": "2"}, "'2'"),
- ({"type": "number", "value": "-0"}, "-0"),
- ({"type": "number", "value": "Infinity"}, "Infinity"),
- ({"type": "number", "value": "-Infinity"}, "-Infinity"),
- ({"type": "number", "value": 3}, "3"),
- ({"type": "number", "value": 1.4}, "1.4"),
- ({"type": "boolean", "value": True}, "true"),
- ({"type": "boolean", "value": False}, "false"),
- ({"type": "bigint", "value": "42"}, "42n"),
- ],
-)
-async def test_primitive_values(bidi_session, top_context, argument, expected):
- result = await bidi_session.script.call_function(
- function_declaration=f"""(arg) => {{
- if(arg!=={expected})
- throw Error("Argument should be {expected}, but was "+arg);
- return arg;
- }}""",
- arguments=[argument],
- await_promise=False,
- target=ContextTarget(top_context["context"]),
- )
-
- recursive_compare(argument, result)
-
-
-@pytest.mark.asyncio
-async def test_nan(bidi_session, top_context):
- nan_remote_value = {"type": "number", "value": "NaN"}
- result = await bidi_session.script.call_function(
- function_declaration=f"""(arg) => {{
- if(!isNaN(arg))
- throw Error("Argument should be 'NaN', but was "+arg);
- return arg;
- }}""",
- arguments=[nan_remote_value],
- await_promise=False,
- target=ContextTarget(top_context["context"]),
- )
-
- recursive_compare(nan_remote_value, result)
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize(
- "argument, expected_type",
- [
- ({
- "type": "array",
- "value": [
- {"type": "string", "value": "foobar"},
- ],
- },
- "Array"
- ),
- ({"type": "date", "value": "2022-05-31T13:47:29.000Z"},
- "Date"
- ),
- ({
- "type": "map",
- "value": [
- ["foobar", {"type": "string", "value": "foobar"}],
- ],
- },
- "Map"
- ),
- ({
- "type": "object",
- "value": [
- ["foobar", {"type": "string", "value": "foobar"}],
- ],
- },
- "Object"
- ),
- ({"type": "regexp", "value": {"pattern": "foo", "flags": "g"}},
- "RegExp"
- ),
- ({
- "type": "set",
- "value": [
- {"type": "string", "value": "foobar"},
- ],
- },
- "Set"
- )
- ],
-)
-async def test_local_values(bidi_session, top_context, argument, expected_type):
- result = await bidi_session.script.call_function(
- function_declaration=f"""(arg) => {{
- if(! (arg instanceof {expected_type}))
- throw Error("Argument type should be {expected_type}, but was "+
- Object.prototype.toString.call(arg));
- return arg;
- }}""",
- arguments=[argument],
- await_promise=False,
- target=ContextTarget(top_context["context"]),
- )
-
- recursive_compare(argument, result)
-
-
@pytest.mark.asyncio
@pytest.mark.parametrize(
"value_fn, function_declaration",
@@ -293,11 +270,11 @@ async def test_local_values(bidi_session, top_context, argument, expected_type):
),
],
)
-async def test_remote_value_deserialization(
+async def test_remote_reference_deserialization(
bidi_session, top_context, call_function, evaluate, value_fn, function_declaration
):
remote_value = await evaluate(
- "window.SOME_OBJECT = {SOME_PROPERTY:'SOME_VALUE'}; window.SOME_OBJECT",
+ "window.SOME_OBJECT = { SOME_PROPERTY: 'SOME_VALUE' }; window.SOME_OBJECT",
result_ownership="root",
)
@@ -315,6 +292,107 @@ async def test_remote_value_deserialization(
)
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+ "setup_expression, expected_node_type",
+ [
+ ("document.querySelector('img')", 1),
+ ("document.querySelector('input#button').attributes[0]", 2),
+ ("document.querySelector('#with-text-node').childNodes[0]", 3),
+ ("""document.createProcessingInstruction("xml-stylesheet", "href='foo.css'")""", 7),
+ ("document.querySelector('#with-comment').childNodes[0]", 8),
+ ("document", 9),
+ ("document.doctype", 10),
+ ("document.createDocumentFragment()", 11),
+ ("document.querySelector('#custom-element').shadowRoot", 11),
+ ],
+ ids=[
+ "element",
+ "attribute",
+ "text node",
+ "processing instruction",
+ "comment",
+ "document",
+ "doctype",
+ "document fragment",
+ "shadow root",
+ ]
+)
+async def test_remote_reference_node_argument(
+ bidi_session, get_test_page, top_context, setup_expression, expected_node_type
+):
+ await bidi_session.browsing_context.navigate(
+ context=top_context['context'], url=get_test_page(), wait="complete"
+ )
+
+ remote_reference = await bidi_session.script.evaluate(
+ expression=setup_expression,
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+ result = await bidi_session.script.call_function(
+ function_declaration="(node) => node.nodeType",
+ arguments=[remote_reference],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+ assert result == {"type": "number", "value": expected_node_type}
+
+
+@pytest.mark.asyncio
+async def test_remote_reference_node_cdata(bidi_session, inline, top_context):
+ xml_page = inline("""CDATA section: & ]]>.""", doctype="xml")
+
+ await bidi_session.browsing_context.navigate(
+ context=top_context['context'], url=xml_page, wait="complete"
+ )
+
+ remote_reference = await bidi_session.script.evaluate(
+ expression="document.querySelector('foo').childNodes[1]",
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+ result = await bidi_session.script.call_function(
+ function_declaration="(node) => node.nodeType",
+ arguments=[remote_reference],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+ assert result == {"type": "number", "value": 4}
+
+
+@pytest.mark.asyncio
+async def test_remote_reference_sharedId_precedence_over_handle(
+ bidi_session, get_test_page, top_context
+):
+ await bidi_session.browsing_context.navigate(
+ context=top_context['context'], url=get_test_page(), wait="complete"
+ )
+
+ remote_reference = await bidi_session.script.evaluate(
+ expression="document.querySelector('img')",
+ await_promise=False,
+ result_ownership="root",
+ target=ContextTarget(top_context["context"]),
+ )
+
+ assert "handle" in remote_reference
+ # Invalidate shared reference to trigger a "no such node" error
+ remote_reference["sharedId"] = "foo"
+
+ with pytest.raises(error.NoSuchNodeException):
+ await bidi_session.script.call_function(
+ function_declaration="(node) => node.nodeType",
+ arguments=[remote_reference],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+
@pytest.mark.asyncio
@pytest.mark.parametrize(
"expression, function_declaration, expected",
@@ -324,6 +402,7 @@ async def test_remote_value_deserialization(
"(collection) => collection.item(0)",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
@@ -339,6 +418,7 @@ async def test_remote_value_deserialization(
"(nodeList) => nodeList.item(0)",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
@@ -354,7 +434,7 @@ async def test_remote_value_deserialization(
"nodelist"
]
)
-async def test_remote_value_dom_collection(
+async def test_remote_reference_dom_collection(
bidi_session,
inline,
top_context,
@@ -382,4 +462,4 @@ async def test_remote_value_dom_collection(
arguments=[remote_value],
)
- assert result == expected
+ recursive_compare(expected, result)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/invalid.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/invalid.py
index cf5a07f41b7..d73705c6724 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/invalid.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/invalid.py
@@ -10,7 +10,7 @@ pytestmark = pytest.mark.asyncio
async def test_params_target_invalid_type(bidi_session, target):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
await_promise=False,
target=target)
@@ -19,7 +19,7 @@ async def test_params_target_invalid_type(bidi_session, target):
async def test_params_context_invalid_type(bidi_session, context):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
await_promise=False,
target=ContextTarget(context))
@@ -28,7 +28,7 @@ async def test_params_context_invalid_type(bidi_session, context):
async def test_params_sandbox_invalid_type(bidi_session, top_context, sandbox):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
await_promise=False,
target=ContextTarget(top_context["context"],
sandbox))
@@ -37,7 +37,7 @@ async def test_params_sandbox_invalid_type(bidi_session, top_context, sandbox):
async def test_params_context_unknown(bidi_session):
with pytest.raises(error.NoSuchFrameException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
await_promise=False,
target=ContextTarget("_UNKNOWN_"))
@@ -46,7 +46,7 @@ async def test_params_context_unknown(bidi_session):
async def test_params_realm_invalid_type(bidi_session, realm):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
await_promise=False,
target=RealmTarget(realm))
@@ -54,7 +54,7 @@ async def test_params_realm_invalid_type(bidi_session, realm):
async def test_params_realm_unknown(bidi_session):
with pytest.raises(error.NoSuchFrameException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
await_promise=False,
target=RealmTarget("_UNKNOWN_"))
@@ -74,7 +74,7 @@ async def test_params_this_invalid_type(bidi_session, top_context,
this):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
this=this,
await_promise=False,
target=ContextTarget(top_context["context"]))
@@ -85,29 +85,61 @@ async def test_params_arguments_invalid_type(bidi_session, top_context,
arguments):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
arguments=arguments,
await_promise=False,
target=ContextTarget(top_context["context"]))
@pytest.mark.parametrize("argument", [False, "SOME_STRING", 42, {}, []])
-async def test_params_single_argument_invalid_type(bidi_session, top_context,
+async def test_params_arguments_entry_invalid_type(bidi_session, top_context,
argument):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
arguments=[argument],
await_promise=False,
target=ContextTarget(top_context["context"]))
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_arguments_handle_invalid_type(
+ bidi_session, top_context, value
+):
+ serialized_value = {
+ "handle": value,
+ }
+
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.script.call_function(
+ function_declaration="(arg) => arg",
+ arguments=[serialized_value],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]))
+
+
+@pytest.mark.parametrize("value", [None, False, 42, {}, []])
+async def test_params_arguments_sharedId_invalid_type(
+ bidi_session, top_context, value
+):
+ serialized_value = {
+ "sharedId": value,
+ }
+
+ with pytest.raises(error.InvalidArgumentException):
+ await bidi_session.script.call_function(
+ function_declaration="(arg) => arg",
+ arguments=[serialized_value],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]))
+
+
@pytest.mark.parametrize("await_promise", [None, "False", 0, 42, {}, []])
async def test_params_await_promise_invalid_type(bidi_session, top_context,
await_promise):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
await_promise=await_promise,
target=ContextTarget(top_context["context"]))
@@ -117,7 +149,7 @@ async def test_params_result_ownership_invalid_value(bidi_session, top_context,
result_ownership):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.script.call_function(
- function_declaration="1 + 2",
+ function_declaration="(arg) => arg",
await_promise=False,
target=ContextTarget(top_context["context"]),
result_ownership=result_ownership)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result_node.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result_node.py
index 08e47be5f71..e1575374fd5 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result_node.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result_node.py
@@ -1,18 +1,7 @@
import pytest
from webdriver.bidi.modules.script import ContextTarget
-
-page_data = """
-
-
-
-
-
-
-"""
+from ... import any_string, recursive_compare
@pytest.mark.asyncio
@@ -25,6 +14,7 @@ page_data = """
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
@@ -41,9 +31,9 @@ page_data = """
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {
- "id": "foo",
"svg:foo": "bar",
},
"childNodeCount": 0,
@@ -56,24 +46,17 @@ page_data = """
),
( # all children including non-element nodes
"""
- () => document.querySelector("div#text-node")
+ () => document.querySelector("#with-text-node")
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
- "attributes": {"id": "text-node"},
- "childNodeCount": 2,
+ "attributes": {"id": "with-text-node"},
+ "childNodeCount": 1,
"children": [{
"type": "node",
- "value": {
- "attributes": {},
- "childNodeCount": 0,
- "localName": "p",
- "namespaceURI": "http://www.w3.org/1999/xhtml",
- "nodeType": 1
- }
- },{
- "type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"nodeType": 3,
@@ -88,15 +71,17 @@ page_data = """
),
( # children limited due to max depth
"""
- () => document.querySelector("div#deep")
+ () => document.querySelector("#with-children")
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
- "attributes": {"id": "deep"},
+ "attributes": {"id": "with-children"},
"childNodeCount": 2,
"children": [{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 1,
@@ -104,8 +89,9 @@ page_data = """
"namespaceURI": "http://www.w3.org/1999/xhtml",
"nodeType": 1
}
- },{
+ }, {
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
@@ -126,6 +112,7 @@ page_data = """
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
@@ -145,10 +132,10 @@ page_data = """
]
)
async def test_element_node(
- bidi_session, inline, top_context, function_declaration, expected
+ bidi_session, get_test_page, top_context, function_declaration, expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
@@ -157,7 +144,7 @@ async def test_element_node(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -166,25 +153,27 @@ async def test_element_node(
[
(
"""
- () => document.querySelector("svg").attributes[0]
+ () => document.querySelector("input#button").attributes[0]
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
"localName": "id",
"namespaceURI": None,
"nodeType": 2,
- "nodeValue": "foo",
+ "nodeValue": "button",
},
},
- ),(
+ ), (
"""
- () => document.querySelector("svg").attributes[1]
+ () => document.querySelector("svg").attributes[0]
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -201,10 +190,10 @@ async def test_element_node(
]
)
async def test_attribute_node(
- bidi_session, inline, top_context, function_declaration, expected
+ bidi_session, get_test_page, top_context, function_declaration, expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
@@ -213,7 +202,7 @@ async def test_attribute_node(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -222,10 +211,11 @@ async def test_attribute_node(
[
(
"""
- () => document.querySelector("div#text-node").childNodes[1]
+ () => document.querySelector("#with-text-node").childNodes[0]
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -238,9 +228,11 @@ async def test_attribute_node(
"basic",
]
)
-async def test_text_node(bidi_session, inline, top_context, function_declaration, expected):
+async def test_text_node(
+ bidi_session, get_test_page, top_context, function_declaration, expected
+):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
@@ -249,7 +241,7 @@ async def test_text_node(bidi_session, inline, top_context, function_declaration
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -262,6 +254,7 @@ async def test_text_node(bidi_session, inline, top_context, function_declaration
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -287,7 +280,7 @@ async def test_cdata_node(bidi_session, inline, new_tab, function_declaration, e
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -300,6 +293,7 @@ async def test_cdata_node(bidi_session, inline, new_tab, function_declaration, e
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -321,14 +315,13 @@ async def test_processing_instruction_node(
context=new_tab['context'], url=xml_page, wait="complete"
)
-
result = await bidi_session.script.call_function(
function_declaration=function_declaration,
target=ContextTarget(new_tab["context"]),
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -337,10 +330,11 @@ async def test_processing_instruction_node(
[
(
"""
- () => document.querySelector("div#comment").childNodes[0]
+ () => document.querySelector("#with-comment").childNodes[0]
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -354,10 +348,10 @@ async def test_processing_instruction_node(
]
)
async def test_comment_node(
- bidi_session, inline, top_context, function_declaration, expected
+ bidi_session, get_test_page, top_context, function_declaration, expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
@@ -366,7 +360,7 @@ async def test_comment_node(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -379,16 +373,19 @@ async def test_comment_node(
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 2,
"children": [{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"nodeType": 10
}
}, {
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 2,
@@ -406,10 +403,10 @@ async def test_comment_node(
]
)
async def test_document_node(
- bidi_session, inline, top_context, function_declaration, expected
+ bidi_session, get_test_page, top_context, function_declaration, expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
@@ -418,7 +415,7 @@ async def test_document_node(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -431,6 +428,7 @@ async def test_document_node(
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -443,10 +441,10 @@ async def test_document_node(
]
)
async def test_doctype_node(
- bidi_session, inline, top_context, function_declaration, expected
+ bidi_session, get_test_page, top_context, function_declaration, expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
@@ -455,7 +453,7 @@ async def test_doctype_node(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -464,10 +462,35 @@ async def test_doctype_node(
[
(
"""
- () => new DocumentFragment()
+ () => document.querySelector("#custom-element").shadowRoot
""",
{
"type": "node",
+ "sharedId": any_string,
+ "value": {
+ "childNodeCount": 1,
+ "children": [{
+ "type": "node",
+ "sharedId": any_string,
+ "value": {
+ "attributes": {"id": "in-shadow-dom"},
+ "childNodeCount": 1,
+ "localName": "div",
+ "namespaceURI": "http://www.w3.org/1999/xhtml",
+ "nodeType": 1
+ }
+ }],
+ "nodeType": 11
+ }
+ }
+ ),
+ (
+ """
+ () => document.createDocumentFragment()
+ """,
+ {
+ "type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -476,14 +499,15 @@ async def test_doctype_node(
}
),
], ids=[
- "basic",
+ "shadow root",
+ "not connected",
]
)
async def test_document_fragment_node(
- bidi_session, inline, top_context, function_declaration, expected
+ bidi_session, get_test_page, top_context, function_declaration, expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
@@ -492,30 +516,31 @@ async def test_document_fragment_node(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
-async def test_node_within_object(bidi_session, inline, top_context):
+async def test_node_within_object(bidi_session, get_test_page, top_context):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
- function_declaration="""() => ({"elem": document.querySelector("span")})""",
+ function_declaration="""() => ({"elem": document.querySelector("img")})""",
target=ContextTarget(top_context["context"]),
await_promise=False,
)
- assert result == {
+ expected = {
"type": "object",
"value": [
["elem", {
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
- "localName": "span",
+ "localName": "img",
"namespaceURI": "http://www.w3.org/1999/xhtml",
"nodeType": 1
}
@@ -523,22 +548,25 @@ async def test_node_within_object(bidi_session, inline, top_context):
]
}
+ recursive_compare(expected, result)
+
@pytest.mark.asyncio
@pytest.mark.parametrize(
"function_declaration, expected",
[
(
- "() => document.getElementsByTagName('span')",
+ "() => document.getElementsByTagName('img')",
{
"type": "htmlcollection",
"value": [
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
- "localName": "span",
+ "localName": "img",
"namespaceURI": "http://www.w3.org/1999/xhtml",
"nodeType": 1
}
@@ -547,16 +575,17 @@ async def test_node_within_object(bidi_session, inline, top_context):
}
),
(
- "() => document.querySelectorAll('span')",
+ "() => document.querySelectorAll('img')",
{
"type": "nodelist",
"value": [
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
- "localName": "span",
+ "localName": "img",
"namespaceURI": "http://www.w3.org/1999/xhtml",
"nodeType": 1
}
@@ -571,13 +600,13 @@ async def test_node_within_object(bidi_session, inline, top_context):
)
async def test_node_within_dom_collection(
bidi_session,
- inline,
+ get_test_page,
top_context,
function_declaration,
expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.call_function(
@@ -586,4 +615,4 @@ async def test_node_within_dom_collection(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/sandbox.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/sandbox.py
index e0a4914d8f6..382ede3c783 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/sandbox.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/sandbox.py
@@ -127,6 +127,23 @@ async def test_sandbox_with_side_effects(bidi_session, new_tab):
assert result_in_sandbox_2 == expected_value
+@pytest.mark.asyncio
+async def test_sandbox_returns_same_node(bidi_session, new_tab):
+ node = await bidi_session.script.call_function(
+ function_declaration="() => document.querySelector('body')",
+ target=ContextTarget(new_tab["context"]),
+ await_promise=True,
+ )
+ recursive_compare({"type": "node", "sharedId": any_string}, node)
+
+ node_sandbox = await bidi_session.script.call_function(
+ function_declaration="() => document.querySelector('body')",
+ target=ContextTarget(new_tab["context"], sandbox="sandbox_1"),
+ await_promise=True,
+ )
+ assert node_sandbox == node
+
+
@pytest.mark.asyncio
async def test_arguments(bidi_session, new_tab):
argument = {
@@ -135,21 +152,39 @@ async def test_arguments(bidi_session, new_tab):
{"type": "string", "value": "foobar"},
],
}
+
result = await bidi_session.script.call_function(
- function_declaration=f"""(arg) => {{
+ function_declaration="""(arg) => {
if(! (arg instanceof Set))
throw Error("Argument type should be Set, but was "+
Object.prototype.toString.call(arg));
return arg;
- }}""",
+ }""",
arguments=[argument],
await_promise=False,
target=ContextTarget(new_tab["context"], "sandbox"),
)
-
recursive_compare(argument, result)
+@pytest.mark.asyncio
+async def test_arguments_uses_same_node_in_sandbox(bidi_session, new_tab):
+ node = await bidi_session.script.call_function(
+ function_declaration="() => document.querySelector('body')",
+ target=ContextTarget(new_tab["context"]),
+ await_promise=True,
+ )
+ recursive_compare({"type": "node", "sharedId": any_string}, node)
+
+ result = await bidi_session.script.call_function(
+ function_declaration="""(node) => node.localName""",
+ arguments=[node],
+ await_promise=False,
+ target=ContextTarget(new_tab["context"], "sandbox"),
+ )
+ assert result == {"type": "string", "value": "body"}
+
+
@pytest.mark.asyncio
@pytest.mark.parametrize("await_promise", [True, False])
async def test_exception_details(bidi_session, new_tab, await_promise):
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/node_shared_id.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/node_shared_id.py
new file mode 100644
index 00000000000..410d029207c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/node_shared_id.py
@@ -0,0 +1,72 @@
+import pytest
+
+from webdriver import Element, ShadowRoot
+from webdriver.bidi.modules.script import ContextTarget
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize(
+ "expression, expected_node_type",
+ [
+ ("""return document.querySelector("div#with-children")""", 1),
+ ("""return document.querySelector("custom-element").shadowRoot""", 11),
+ ],
+ ids=["Element", "ShadowRoot"],
+)
+async def test_web_reference_created_in_classic(
+ bidi_session,
+ current_session,
+ get_test_page,
+ top_context,
+ expression,
+ expected_node_type
+):
+ current_session.url = get_test_page()
+
+ node = current_session.execute_script(expression)
+ shared_id = node.id
+
+ # Use element reference from WebDriver classic in WebDriver BiDi
+ result = await bidi_session.script.call_function(
+ function_declaration="(node)=>{return node.nodeType}",
+ arguments=[{"sharedId": shared_id}],
+ await_promise=False,
+ target=ContextTarget(top_context["context"]),
+ )
+
+ assert result == {"type": "number", "value": expected_node_type}
+
+
+@pytest.mark.parametrize(
+ "expression, expected",
+ [
+ ("""document.querySelector("div#with-children")""", 1),
+ ("""document.querySelector("custom-element").shadowRoot""", 11),
+ ],
+ ids=["Element", "ShadowRoot"],
+)
+async def test_web_reference_created_in_bidi(
+ bidi_session,
+ current_session,
+ get_test_page,
+ top_context,
+ expression,
+ expected
+):
+ current_session.url = get_test_page()
+
+ result = await bidi_session.script.evaluate(
+ expression=expression,
+ target=ContextTarget(top_context["context"]),
+ await_promise=False,
+ )
+
+ nodeType = result["value"]["nodeType"]
+ assert nodeType == expected
+
+ # Use web reference from WebDriver BiDi in WebDriver classic
+ types = {1: Element, 11: ShadowRoot}
+ node = types[nodeType](current_session, result["sharedId"])
+ nodeType = current_session.execute_script("""return arguments[0].nodeType""", args=(node,))
+ assert nodeType == expected
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/__init__.py
index e69de29bb2d..8b137891791 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/__init__.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result_node.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result_node.py
index 0d0589a5f38..63915a8f4a4 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result_node.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result_node.py
@@ -1,18 +1,7 @@
import pytest
from webdriver.bidi.modules.script import ContextTarget
-
-page_data = """
-
-
-
-
-
-
-"""
+from ... import any_string, recursive_compare
@pytest.mark.asyncio
@@ -25,6 +14,7 @@ page_data = """
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
@@ -41,9 +31,9 @@ page_data = """
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {
- "id": "foo",
"svg:foo": "bar",
},
"childNodeCount": 0,
@@ -56,24 +46,17 @@ page_data = """
),
( # all children including non-element nodes
"""
- document.querySelector("div#text-node")
+ document.querySelector("#with-text-node")
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
- "attributes": {"id": "text-node"},
- "childNodeCount": 2,
+ "attributes": {"id": "with-text-node"},
+ "childNodeCount": 1,
"children": [{
"type": "node",
- "value": {
- "attributes": {},
- "childNodeCount": 0,
- "localName": "p",
- "namespaceURI": "http://www.w3.org/1999/xhtml",
- "nodeType": 1
- }
- },{
- "type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"nodeType": 3,
@@ -88,15 +71,17 @@ page_data = """
),
( # children limited due to max depth
"""
- document.querySelector("div#deep")
+ document.querySelector("#with-children")
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
- "attributes": {"id": "deep"},
+ "attributes": {"id": "with-children"},
"childNodeCount": 2,
"children": [{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 1,
@@ -104,8 +89,9 @@ page_data = """
"namespaceURI": "http://www.w3.org/1999/xhtml",
"nodeType": 1
}
- },{
+ }, {
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
@@ -126,6 +112,7 @@ page_data = """
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
@@ -144,9 +131,9 @@ page_data = """
"not_connected",
]
)
-async def test_element_node(bidi_session, inline, top_context, expression, expected):
+async def test_element_node(bidi_session, get_test_page, top_context, expression, expected):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
@@ -155,7 +142,7 @@ async def test_element_node(bidi_session, inline, top_context, expression, expec
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -164,25 +151,27 @@ async def test_element_node(bidi_session, inline, top_context, expression, expec
[
(
"""
- document.querySelector("svg").attributes[0]
+ document.querySelector("input#button").attributes[0]
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
"localName": "id",
"namespaceURI": None,
"nodeType": 2,
- "nodeValue": "foo",
+ "nodeValue": "button",
},
},
- ),(
+ ), (
"""
- document.querySelector("svg").attributes[1]
+ document.querySelector("svg").attributes[0]
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -195,12 +184,12 @@ async def test_element_node(bidi_session, inline, top_context, expression, expec
),
], ids=[
"basic",
- "namespace",
+ "namespaceURI",
]
)
-async def test_attribute_node(bidi_session, inline, top_context, expression, expected):
+async def test_attribute_node(bidi_session, get_test_page, top_context, expression, expected):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
@@ -209,7 +198,7 @@ async def test_attribute_node(bidi_session, inline, top_context, expression, exp
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -218,10 +207,11 @@ async def test_attribute_node(bidi_session, inline, top_context, expression, exp
[
(
"""
- document.querySelector("div#text-node").childNodes[1]
+ document.querySelector("#with-text-node").childNodes[0]
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -234,9 +224,9 @@ async def test_attribute_node(bidi_session, inline, top_context, expression, exp
"basic",
]
)
-async def test_text_node(bidi_session, inline, top_context, expression, expected):
+async def test_text_node(bidi_session, get_test_page, top_context, expression, expected):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
@@ -245,7 +235,7 @@ async def test_text_node(bidi_session, inline, top_context, expression, expected
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -258,6 +248,7 @@ async def test_text_node(bidi_session, inline, top_context, expression, expected
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -283,7 +274,7 @@ async def test_cdata_node(bidi_session, inline, new_tab, expression, expected):
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -296,6 +287,7 @@ async def test_cdata_node(bidi_session, inline, new_tab, expression, expected):
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -317,14 +309,13 @@ async def test_processing_instruction_node(
context=new_tab['context'], url=xml_page, wait="complete"
)
-
result = await bidi_session.script.evaluate(
expression=expression,
target=ContextTarget(new_tab["context"]),
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -333,10 +324,11 @@ async def test_processing_instruction_node(
[
(
"""
- document.querySelector("div#comment").childNodes[0]
+ document.querySelector("#with-comment").childNodes[0]
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -349,9 +341,9 @@ async def test_processing_instruction_node(
"basic",
]
)
-async def test_comment_node(bidi_session, inline, top_context, expression, expected):
+async def test_comment_node(bidi_session, get_test_page, top_context, expression, expected):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
@@ -360,7 +352,7 @@ async def test_comment_node(bidi_session, inline, top_context, expression, expec
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -373,16 +365,19 @@ async def test_comment_node(bidi_session, inline, top_context, expression, expec
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 2,
"children": [{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"nodeType": 10
}
}, {
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 2,
@@ -399,9 +394,9 @@ async def test_comment_node(bidi_session, inline, top_context, expression, expec
"basic",
]
)
-async def test_document_node(bidi_session, inline, top_context, expression, expected):
+async def test_document_node(bidi_session, get_test_page, top_context, expression, expected):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
@@ -410,7 +405,7 @@ async def test_document_node(bidi_session, inline, top_context, expression, expe
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@@ -423,6 +418,7 @@ async def test_document_node(bidi_session, inline, top_context, expression, expe
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -434,9 +430,9 @@ async def test_document_node(bidi_session, inline, top_context, expression, expe
"basic",
]
)
-async def test_doctype_node(bidi_session, inline, top_context, expression, expected):
+async def test_doctype_node(bidi_session, get_test_page, top_context, expression, expected):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
@@ -445,19 +441,44 @@ async def test_doctype_node(bidi_session, inline, top_context, expression, expec
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
@pytest.mark.parametrize(
"expression, expected",
[
+ (
+ """
+ document.querySelector("#custom-element").shadowRoot;
+ """,
+ {
+ "type": "node",
+ "sharedId": any_string,
+ "value": {
+ "childNodeCount": 1,
+ "children": [{
+ "type": "node",
+ "sharedId": any_string,
+ "value": {
+ "attributes": {"id": "in-shadow-dom"},
+ "childNodeCount": 1,
+ "localName": "div",
+ "namespaceURI": "http://www.w3.org/1999/xhtml",
+ "nodeType": 1
+ }
+ }],
+ "nodeType": 11
+ }
+ }
+ ),
(
"""
new DocumentFragment();
""",
{
"type": "node",
+ "sharedId": any_string,
"value": {
"childNodeCount": 0,
"children": [],
@@ -466,14 +487,15 @@ async def test_doctype_node(bidi_session, inline, top_context, expression, expec
}
),
], ids=[
- "basic",
+ "shadowRoot",
+ "not connected"
]
)
async def test_document_fragment_node(
- bidi_session, inline, top_context, expression, expected
+ bidi_session, get_test_page, top_context, expression, expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
@@ -482,30 +504,31 @@ async def test_document_fragment_node(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
@pytest.mark.asyncio
-async def test_node_within_object(bidi_session, inline, top_context):
+async def test_node_within_object(bidi_session, get_test_page, top_context):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
- expression="""({"elem": document.querySelector("span")})""",
+ expression="""({"elem": document.querySelector("img")})""",
target=ContextTarget(top_context["context"]),
await_promise=False,
)
- assert result == {
+ expected = {
"type": "object",
"value": [
["elem", {
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
- "localName": "span",
+ "localName": "img",
"namespaceURI": "http://www.w3.org/1999/xhtml",
"nodeType": 1
}
@@ -513,22 +536,25 @@ async def test_node_within_object(bidi_session, inline, top_context):
]
}
+ recursive_compare(expected, result)
+
@pytest.mark.asyncio
@pytest.mark.parametrize(
"expression, expected",
[
(
- "document.getElementsByTagName('span')",
+ "document.getElementsByTagName('img')",
{
"type": "htmlcollection",
"value": [
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
- "localName": "span",
+ "localName": "img",
"namespaceURI": "http://www.w3.org/1999/xhtml",
"nodeType": 1
}
@@ -537,16 +563,17 @@ async def test_node_within_object(bidi_session, inline, top_context):
}
),
(
- "document.querySelectorAll('span')",
+ "document.querySelectorAll('img')",
{
"type": "nodelist",
"value": [
{
"type": "node",
+ "sharedId": any_string,
"value": {
"attributes": {},
"childNodeCount": 0,
- "localName": "span",
+ "localName": "img",
"namespaceURI": "http://www.w3.org/1999/xhtml",
"nodeType": 1
}
@@ -561,13 +588,13 @@ async def test_node_within_object(bidi_session, inline, top_context):
)
async def test_node_within_dom_collection(
bidi_session,
- inline,
+ get_test_page,
top_context,
expression,
expected
):
await bidi_session.browsing_context.navigate(
- context=top_context['context'], url=inline(page_data), wait="complete"
+ context=top_context['context'], url=get_test_page(), wait="complete"
)
result = await bidi_session.script.evaluate(
@@ -576,4 +603,4 @@ async def test_node_within_dom_collection(
await_promise=False,
)
- assert result == expected
+ recursive_compare(expected, result)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/sandbox.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/sandbox.py
index ba4eb732d16..3a6771780d5 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/sandbox.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/sandbox.py
@@ -127,6 +127,23 @@ async def test_sandbox_with_side_effects(bidi_session, new_tab):
assert result_in_sandbox_2 == expected_value
+@pytest.mark.asyncio
+async def test_sandbox_returns_same_node(bidi_session, new_tab):
+ node = await bidi_session.script.evaluate(
+ expression="document.querySelector('body')",
+ target=ContextTarget(new_tab["context"]),
+ await_promise=True,
+ )
+ recursive_compare({"type": "node", "sharedId": any_string}, node)
+
+ node_sandbox = await bidi_session.script.evaluate(
+ expression="document.querySelector('body')",
+ target=ContextTarget(new_tab["context"], sandbox="sandbox_1"),
+ await_promise=True,
+ )
+ assert node_sandbox == node
+
+
@pytest.mark.asyncio
@pytest.mark.parametrize("await_promise", [True, False])
async def test_exception_details(bidi_session, new_tab, await_promise):
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
index fa96ed3a58a..9b0d7f2133f 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
@@ -45,7 +45,7 @@ def test_null_response_value(session, inline):
def test_no_top_browsing_context(session, closed_window):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_clear(session, element)
assert_error(response, "no such window")
@@ -59,14 +59,14 @@ def test_no_top_browsing_context(session, closed_window):
def test_no_browsing_context(session, closed_frame):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_clear(session, element)
assert_error(response, "no such window")
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_clear(session, element)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/click.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/click.py
index 79be957d1b2..3c3f7d70e6c 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/click.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/click.py
@@ -21,7 +21,7 @@ def test_null_response_value(session, inline):
def test_no_top_browsing_context(session, closed_window):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_click(session, element)
assert_error(response, "no such window")
@@ -35,14 +35,14 @@ def test_no_top_browsing_context(session, closed_window):
def test_no_browsing_context(session, closed_frame):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_click(session, element)
assert_error(response, "no such window")
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_click(session, element)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/send_keys.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/send_keys.py
index 854d2af42cc..281c7ad719d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/send_keys.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/send_keys.py
@@ -34,7 +34,7 @@ def test_null_response_value(session, inline):
def test_no_top_browsing_context(session, closed_window):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_send_keys(session, element, "foo")
assert_error(response, "no such window")
@@ -48,14 +48,14 @@ def test_no_top_browsing_context(session, closed_window):
def test_no_browsing_context(session, closed_frame):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_send_keys(session, element, "foo")
assert_error(response, "no such window")
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = element_send_keys(session, element, "foo")
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/arguments.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/arguments.py
index 55fd9527aea..ead6e0c186e 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/arguments.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/arguments.py
@@ -55,7 +55,7 @@ def test_object(session):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
result = execute_async_script(session, """
arguments[1](true);
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/arguments.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/arguments.py
index 53c49aaa689..b8657ce0efa 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/arguments.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/arguments.py
@@ -47,7 +47,7 @@ def test_object(session):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
result = execute_script(session, "return true;", args=[element])
assert_error(result, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/get.py
index 8124fee0c9d..0dc00a471a9 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_label/get.py
@@ -19,7 +19,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
result = get_computed_label(session, element.id)
assert_error(result, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/get.py
index dcfe753f0dc..8d15e8fb90d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_computed_role/get.py
@@ -19,7 +19,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
result = get_computed_role(session, element.id)
assert_error(result, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py
index e23d7e4d5ab..375f25032c0 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py
@@ -30,7 +30,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = get_element_attribute(session, element.id, "id")
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/get.py
index f9797c2cff5..6f0a8a56395 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_css_value/get.py
@@ -34,7 +34,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = get_element_css_value(session, element.id, "display")
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py
index 072375804e8..84e4e896281 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py
@@ -31,7 +31,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = get_element_property(session, element.id, "id")
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/get.py
index 7f87b44e7e9..942f119f43c 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_rect/get.py
@@ -34,7 +34,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = get_element_rect(session, element.id)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/get.py
index 61d0d008100..d9adde0b9e3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_shadow_root/get.py
@@ -30,7 +30,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = get_shadow_root(session, element.id)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py
index 1bf19309e45..3bb03d79886 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py
@@ -30,7 +30,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = get_element_tag_name(session, element.id)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
index aa36c487c80..e8d559cf661 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
@@ -30,7 +30,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = get_element_text(session, element.id)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/enabled.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/enabled.py
index 34e5cce4197..fccff383a55 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/enabled.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/is_element_enabled/enabled.py
@@ -33,7 +33,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = is_element_enabled(session, element.id)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py
index b119705e7dd..1fb5b9ce86b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py
@@ -49,7 +49,7 @@ def test_no_browsing_context(session, closed_frame):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = is_element_selected(session, element.id)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/print/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/print/__init__.py
index 788c0e1a317..e69de29bb2d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/print/__init__.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/print/__init__.py
@@ -1,21 +0,0 @@
-def load_pdf_document(session, inline, pdf_data):
- """Load a PDF document in the browser using pdf.js"""
- session.url = inline("""
-
-
-
-
-""" % pdf_data)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py b/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
index 169e2249a99..415786675c5 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
@@ -3,7 +3,6 @@ from base64 import decodebytes
import pytest
-from . import load_pdf_document
from tests.support.asserts import assert_error, assert_success
@@ -91,7 +90,7 @@ def test_large_html_document(session, inline):
(["-5", "2-"], ["Page 1", "Page 2", "Page 3", "Page 4", "Page 5", "Page 6", "Page 7", "Page 8", "Page 9", "Page 10"]),
([], ["Page 1", "Page 2", "Page 3", "Page 4", "Page 5", "Page 6", "Page 7", "Page 8", "Page 9", "Page 10"]),
])
-def test_page_ranges_document(session, inline, ranges, expected):
+def test_page_ranges_document(session, inline, load_pdf_document, ranges, expected):
session.url = inline("""
+
+
+
+ """
+
+ page_data = f"""
+
+
+ Lorem
+
+
+
+
+
+
+
+
+ {iframe(frame_doc)}
+
+ ![]()
+
+
+
+ """
+
+ if as_frame:
+ return inline(iframe(page_data))
+ else:
+ return inline(page_data)
+
+ return get_test_page
+
+
+@pytest.fixture
+def test_page_with_pdf_js(inline):
+ """Prepare an url to load a PDF document in the browser using pdf.js"""
+ def test_page_with_pdf_js(encoded_pdf_data):
+ return inline("""
+
+
+
+
+""" % encoded_pdf_data)
+
+ return test_page_with_pdf_js
+
+
@pytest.fixture
async def top_context(bidi_session):
contexts = await bidi_session.browsing_context.get_tree()
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_bidi.py b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_bidi.py
index 6273b8f1575..6f1106373d9 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_bidi.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_bidi.py
@@ -140,3 +140,33 @@ def add_and_remove_iframe(bidi_session, inline):
return frame_id
return closed_frame
+
+
+@pytest.fixture
+def load_pdf(bidi_session, test_page_with_pdf_js, top_context):
+ """Load a PDF document in the browser using pdf.js"""
+ async def load_pdf(encoded_pdf_data, context=top_context["context"]):
+ url = test_page_with_pdf_js(encoded_pdf_data)
+
+ await bidi_session.browsing_context.navigate(
+ context=context, url=url, wait="complete"
+ )
+
+ return load_pdf
+
+
+@pytest.fixture
+def get_pdf_content(bidi_session, top_context, load_pdf):
+ """Load a PDF document in the browser using pdf.js and extract content from the document"""
+ async def get_pdf_content(encoded_pdf_data, context=top_context["context"]):
+ await load_pdf(encoded_pdf_data=encoded_pdf_data, context=context)
+
+ result = await bidi_session.script.call_function(
+ function_declaration="""() => { return window.getText()}""",
+ target=ContextTarget(context),
+ await_promise=True,
+ )
+
+ return result
+
+ return get_pdf_content
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_http.py b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_http.py
index 748fe214a2b..65ea064c519 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_http.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_http.py
@@ -178,89 +178,9 @@ def stale_element(current_session, get_test_page):
@pytest.fixture
-def get_test_page(iframe, inline):
- def get_test_page(
- as_frame=False,
- frame_doc=None,
- shadow_doc=None,
- nested_shadow_dom=False
- ):
- if frame_doc is None:
- frame_doc = """"""
+def load_pdf_document(current_session, test_page_with_pdf_js):
+ """Load a PDF document in the browser using pdf.js"""
+ def load_pdf_document(encoded_pdf_data):
+ current_session.url = test_page_with_pdf_js(encoded_pdf_data)
- if shadow_doc is None:
- shadow_doc = """
-
-
-
- """
-
- definition_inner_shadow_dom = ""
- if nested_shadow_dom:
- definition_inner_shadow_dom = f"""
- customElements.define('inner-custom-element',
- class extends HTMLElement {{
- constructor() {{
- super();
- this.attachShadow({{mode: "open"}}).innerHTML = `
- {shadow_doc}
- `;
- }}
- }}
- );
- """
- shadow_doc = """
-
-
-
-
- """
-
- page_data = f"""
-
-
- Lorem
-
-
-
-
-
-
-
-
- {iframe(frame_doc)}
-
-
-
-
- """
-
- if as_frame:
- return inline(iframe(page_data))
- else:
- return inline(page_data)
-
- return get_test_page
+ return load_pdf_document
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/screenshot.py b/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/screenshot.py
index deea9514ed4..ea4cc290db4 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/screenshot.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/take_element_screenshot/screenshot.py
@@ -33,7 +33,7 @@ def test_no_browsing_context(session, closed_frame, inline):
def test_no_such_element_with_invalid_value(session):
- element = Element("foo", session)
+ element = Element(session, "foo")
response = take_element_screenshot(session, element.id)
assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html b/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html
index 770aa49f052..b6dc7da5d40 100644
--- a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html
+++ b/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html
@@ -57,10 +57,10 @@ test(function(t) {
const transceiver = pc.addTransceiver('audio');
const capabilities = transceiver.getHeaderExtensionsToNegotiate();
capabilities[0].uri = "4711";
- assert_throws_dom("NotSupportedError", () => {
+ assert_throws_dom('InvalidModificationError', () => {
transceiver.setHeaderExtensionsToNegotiate(capabilities);
- }, 'transceiver should throw NotSupported when setting an unknown URI');
-}, `setHeaderExtensionsToNegotiate throws NotSupported on encountering unknown URI`);
+ }, 'transceiver should throw InvalidModificationError when setting an unknown URI');
+}, `setHeaderExtensionsToNegotiate throws InvalidModificationError on encountering unknown URI`);
test(function(t) {
const pc = new RTCPeerConnection();
@@ -72,7 +72,7 @@ test(function(t) {
});
["sendonly", "recvonly", "inactive", "stopped"].map(direction => {
capability.direction = direction;
- assert_throws_dom("InvalidModificationError", () => {
+ assert_throws_dom('InvalidModificationError', () => {
transceiver.setHeaderExtensionsToNegotiate(capabilities);
}, `transceiver should throw InvalidModificationError when setting a mandatory header extension\'s direction to ${direction}`);
});
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html
index 8062618dd61..96e763985c0 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html
@@ -187,8 +187,8 @@
8.5. The stats selection algorithm
3. If selector is an RTCRtpSender, gather stats for and add the following objects
to result:
- - All RTCOutboundRTPStreamStats objects corresponding to selector.
- - All stats objects referenced directly or indirectly by the RTCOutboundRTPStreamStats
+ - All RTCOutboundRtpStreamStats objects corresponding to selector.
+ - All stats objects referenced directly or indirectly by the RTCOutboundRtpStreamStats
objects added.
*/
promise_test(async t => {
@@ -208,8 +208,8 @@
8.5. The stats selection algorithm
4. If selector is an RTCRtpReceiver, gather stats for and add the following objects
to result:
- - All RTCInboundRTPStreamStats objects corresponding to selector.
- - All stats objects referenced directly or indirectly by the RTCInboundRTPStreamStats
+ - All RTCInboundRtpStreamStats objects corresponding to selector.
+ - All stats objects referenced directly or indirectly by the RTCInboundRtpStreamStats
added.
*/
promise_test(async t => {
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html
index 06d0f0b39bf..b8daf12fc27 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html
@@ -40,8 +40,8 @@
8.5. The stats selection algorithm
4. If selector is an RTCRtpReceiver, gather stats for and add the following objects
to result:
- - All RTCInboundRTPStreamStats objects corresponding to selector.
- - All stats objects referenced directly or indirectly by the RTCInboundRTPStreamStats
+ - All RTCInboundRtpStreamStats objects corresponding to selector.
+ - All stats objects referenced directly or indirectly by the RTCInboundRtpStreamStats
added.
*/
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html
index 27ac3e952f1..62c01aafa6a 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html
@@ -35,8 +35,8 @@
8.5. The stats selection algorithm
3. If selector is an RTCRtpSender, gather stats for and add the following objects
to result:
- - All RTCOutboundRTPStreamStats objects corresponding to selector.
- - All stats objects referenced directly or indirectly by the RTCOutboundRTPStreamStats
+ - All RTCOutboundRtpStreamStats objects corresponding to selector.
+ - All stats objects referenced directly or indirectly by the RTCOutboundRtpStreamStats
objects added.
*/
diff --git a/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm b/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm
index 4768fe70bcb..d2278d3717c 100644
--- a/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm
+++ b/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm
@@ -1,6 +1,7 @@
Worker constructor with wrong MIME type scripts
+