Skip to content

Commit 3336ea5

Browse files
committed
Bug 1522790 - [wpt] Fix intermittent test failures for short timer. r=whimboo
Depends on D23972 Differential Revision: https://phabricator.services.mozilla.com/D204234
1 parent a8bebb7 commit 3336ea5

5 files changed

+11
-22
lines changed

testing/web-platform/meta/html/webappapis/timers/setinterval-cross-realm-callback-report-exception.html.ini

-6
This file was deleted.

testing/web-platform/meta/html/webappapis/timers/settimeout-cross-realm-callback-report-exception.html.ini

-7
This file was deleted.

testing/web-platform/tests/html/semantics/disabled-elements/event-propagate-disabled.tentative.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,11 @@
153153
await new Promise(resolve => t.step_timeout(resolve, 0));
154154

155155
const expected = isDisabledFormControl(element) ? expectedEvents : nonDisabledExpectedEvents;
156-
assert_array_equals(observedEvents.map(e => e.type), expected, "Observed events");
156+
157+
t.step_wait_func_done(() => observedEvents.length > 0,
158+
() => assert_array_equals(observedEvents.map(e => e.type), expected, "Observed events"),
159+
undefined, 1000, 10);
160+
;
157161

158162
for (const observed of observedEvents) {
159163
assert_equals(observed.target, target, `${observed.type}.target`)

testing/web-platform/tests/html/webappapis/timers/setinterval-cross-realm-callback-report-exception.html

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
`), 4);
2424
window.clearThisInterval = () => { frames[0].clearInterval(id); };
2525

26-
t.step_timeout(() => {
27-
assert_array_equals(onerrorCalls, ["frame1"]);
28-
t.done();
29-
}, 8);
26+
t.step_wait_func_done(() => onerrorCalls.length > 0,
27+
() => assert_array_equals(onerrorCalls, ["frame1"]),
28+
undefined, 1000, 10);
3029
});
3130
});
3231
</script>

testing/web-platform/tests/html/webappapis/timers/settimeout-cross-realm-callback-report-exception.html

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
window.onload = t.step_func(() => {
2020
frames[0].setTimeout(new frames[1].Function(`throw new parent.frames[2].Error("PASS");`), 4);
2121

22-
t.step_timeout(() => {
23-
assert_array_equals(onerrorCalls, ["frame1"]);
24-
t.done();
25-
}, 8);
22+
t.step_wait_func_done(() => onerrorCalls.length > 0,
23+
() => assert_array_equals(onerrorCalls, ["frame1"]),
24+
undefined, 1000, 10);
2625
});
2726
});
2827
</script>

0 commit comments

Comments
 (0)