diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /testing/web-platform/tests/fenced-frame/setting-null-config-navigates-to-about-blank.https.html | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/web-platform/tests/fenced-frame/setting-null-config-navigates-to-about-blank.https.html')
| -rw-r--r-- | testing/web-platform/tests/fenced-frame/setting-null-config-navigates-to-about-blank.https.html | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/testing/web-platform/tests/fenced-frame/setting-null-config-navigates-to-about-blank.https.html b/testing/web-platform/tests/fenced-frame/setting-null-config-navigates-to-about-blank.https.html index 2595fd64c9..c8322dab19 100644 --- a/testing/web-platform/tests/fenced-frame/setting-null-config-navigates-to-about-blank.https.html +++ b/testing/web-platform/tests/fenced-frame/setting-null-config-navigates-to-about-blank.https.html @@ -1,4 +1,5 @@ <!DOCTYPE html> +<meta name=timeout content=long> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> <script src="/common/utils.js"></script> @@ -11,13 +12,13 @@ <script> promise_test(async (t) => { - var frame_context = attachFencedFrameContext(); + var frame_context = await attachFencedFrameContext(); // Ensure remote context responds. let alive_indicator = await Promise.race([ frame_context.execute(() => 'alive'), new Promise((resolve, reject) => t.step_timeout( - () => reject('timed_out'), 3000)) + () => reject('timed_out'), 1500)) ]); assert_equals(alive_indicator, 'alive'); @@ -28,14 +29,20 @@ // removed. frame_context.element.config = null; + let fenced_frame_alive_promise = async (resolve) => { + await frame_context.execute(() => {}); + resolve('alive'); + }; + // This call should not succeed, because we should have navigated to // about:blank. Note that because the code has been deleted as described // above, we can't actually inspect the URL to determine it is // about:blank; we have to use our timeout as a proxy. let timeout_indicator = await Promise.any([ - frame_context.execute(() => 'alive'), new Promise(resolve => t.step_timeout( - () => resolve('timed_out'), 3000)) + () => fenced_frame_alive_promise(resolve), 500)), + new Promise(resolve => t.step_timeout( + () => resolve('timed_out'), 1500)) ]); assert_equals(timeout_indicator, 'timed_out'); }, "Test that a fenced frame with a config explicitly set to null navigates to about:blank"); |