Skip to content

Commit

Permalink
Set explicit_timeout to true in nested window test environment in blo…
Browse files Browse the repository at this point in the history
…b URL tests.

This way the tests will timeout when the outer window decides time has
expired, rather than let the nested window decide it earlier.

This mimics the behavior of fetch_tests_from_worker, since
WorkerTestEnvironment always behaves as if explicit_timeout is set to
true.

This should fix spurious timeouts of this test that aren't detected as
timeouts by our test runner (and specifically cases where we don't
actually consider the test as timed out).

Bug: 801078
Change-Id: I3a884bd746afcefd5cbe5008db7df4a609eb0044
Reviewed-on: https://chromium-review.googlesource.com/865002
Commit-Queue: Victor Costan <pwnall@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#529500}
  • Loading branch information
mkruisselbrink authored and chromium-wpt-export-bot committed Jan 17, 2018
1 parent 0c2ee4f commit 90a4eac
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions FileAPI/url/sandboxed-iframe.html
Expand Up @@ -9,7 +9,6 @@
<script>

const iframe_scripts = [
'/resources/testharness.js',
'resources/fetch-tests.js',
'url-format.any.js',
'url-with-xhr.any.js',
Expand All @@ -18,6 +17,8 @@
];

let html = '<!doctype html>\n<meta charset="utf-8">\n<body>\n';
html = html + '<script src="/resources/testharness.js"></' + 'script>\n';
html = html + '<script>setup({"explicit_timeout": true});</' + 'script>\n';
for (const script of iframe_scripts)
html = html + '<script src="' + script + '"></' + 'script>\n';

Expand All @@ -27,4 +28,4 @@

fetch_tests_from_window(frame.contentWindow);

</script>
</script>

0 comments on commit 90a4eac

Please sign in to comment.