Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: LayoutTests/http/tests/security/w3c/cross-origin-objects.html

Issue 1189983002: bindings: Fixes a flaky test cross-origin-objects.html. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/security/w3c/cross-origin-objects.html
diff --git a/LayoutTests/http/tests/security/w3c/cross-origin-objects.html b/LayoutTests/http/tests/security/w3c/cross-origin-objects.html
index fa61e332cca2ac6750f5ed6758b8622278c7d2bf..cd9258dda51dbdbfa31ced00bbaabf30119a4720 100644
--- a/LayoutTests/http/tests/security/w3c/cross-origin-objects.html
+++ b/LayoutTests/http/tests/security/w3c/cross-origin-objects.html
@@ -11,13 +11,6 @@ https://github.com/w3c/web-platform-tests/tree/master/html/browsers/origin/cross
TODO(yukishiino): Redesign the security model of DOM-V8 binding code and fix all the failing test cases.
-->
-<script>
-// This test needs to run on 'web-platform.test:8000'.
-if (document.location.hostname != "web-platform.test")
- document.location = document.location.protocol + "//web-platform.test:8000" + document.location.pathname;
-if (window.testRunner)
- window.testRunner.setCanOpenWindows();
-</script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<div id=log></div>
@@ -25,6 +18,14 @@ if (window.testRunner)
<iframe id="C"></iframe>
<script>
+// This test needs to run on 'web-platform.test:8000'.
+if (document.location.hostname != "web-platform.test") {
+ document.location = document.location.protocol + "//web-platform.test:8000" + document.location.pathname;
tkent 2015/06/17 07:41:16 Do we setup httpd for web-platform.test:8000 durin
Yuki 2015/06/17 08:25:16 I don't know what magic is happening, but all the
tkent 2015/06/18 00:41:38 ok, probably the magic is true because try bots ra
+} else { // The main content of the test.
+
+if (window.testRunner)
+ window.testRunner.setCanOpenWindows();
+
/*
* Setup boilerplate. This gives us a same-origin window "B" and a cross-origin
* window "C".
@@ -346,4 +347,6 @@ function runNextTest() {
}
reloadSubframes(runNextTest);
+} // if (document.location.hostname != "web-platform.test")
+
</script>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698