Modified: trunk/LayoutTests/ChangeLog (205907 => 205908)
--- trunk/LayoutTests/ChangeLog 2016-09-14 16:23:00 UTC (rev 205907)
+++ trunk/LayoutTests/ChangeLog 2016-09-14 16:40:13 UTC (rev 205908)
@@ -1,3 +1,15 @@
+2016-09-14 Youenn Fablet <[email protected]>
+
+ LayoutTest http/tests/security/cross-origin-cached-scripts-parallel.html is a flaky failure
+ https://bugs.webkit.org/show_bug.cgi?id=161912
+
+ Reviewed by Alexey Proskuryakov.
+
+ * TestExpectations: Removing flaky expectation.
+ * http/tests/security/cross-origin-cached-scripts-parallel-expected.txt:
+ * http/tests/security/cross-origin-cached-scripts-parallel.html: Increase timeout to ensure load is made in parallel.
+ Fixed flakiness by doing parallel loads in two shots of two, in lieu of 1 shot of 4.
+
2016-09-14 Ryan Haddad <[email protected]>
Marking inspector/console/messagesCleared.html as flaky on mac-debug.
Modified: trunk/LayoutTests/TestExpectations (205907 => 205908)
--- trunk/LayoutTests/TestExpectations 2016-09-14 16:23:00 UTC (rev 205907)
+++ trunk/LayoutTests/TestExpectations 2016-09-14 16:40:13 UTC (rev 205908)
@@ -979,5 +979,3 @@
webkit.org/b/160017 js/regress-139548.html [ Slow ]
webkit.org/b/161088 imported/w3c/web-platform-tests/resource-timing/resource-timing.html [ Pass Failure ]
-
-webkit.org/b/161912 http/tests/security/cross-origin-cached-scripts-parallel.html [ Pass Failure ]
Modified: trunk/LayoutTests/http/tests/security/cross-origin-cached-scripts-parallel-expected.txt (205907 => 205908)
--- trunk/LayoutTests/http/tests/security/cross-origin-cached-scripts-parallel-expected.txt 2016-09-14 16:23:00 UTC (rev 205907)
+++ trunk/LayoutTests/http/tests/security/cross-origin-cached-scripts-parallel-expected.txt 2016-09-14 16:40:13 UTC (rev 205908)
@@ -5,9 +5,9 @@
Tests source origin difference for cached resources.
Trying to load sequentially the same script from various origins.
-Test 1 PASS: Loaded script http://127.0.0.1:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=100 from localhost:8000 (crossOrigin=anonymous)
-Test 2 PASS: Did not load script http://127.0.0.1:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=100 from localhost:8080 (crossOrigin=anonymous)
-Test 3 PASS: Loaded script http://127.0.0.1:8080/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=100 from localhost:8080
-Test 4 PASS: Did not load script http://127.0.0.1:8080/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=100 from localhost:8080 (crossOrigin=anonymous)
+Test 1 PASS: Loaded script http://127.0.0.1:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=1000 from localhost:8000 (crossOrigin=anonymous)
+Test 2 PASS: Did not load script http://127.0.0.1:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=1000 from localhost:8080 (crossOrigin=anonymous)
+Test 3 PASS: Loaded script http://127.0.0.1:8080/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=1000 from localhost:8080
+Test 4 PASS: Did not load script http://127.0.0.1:8080/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=1000 from localhost:8080 (crossOrigin=anonymous)
Modified: trunk/LayoutTests/http/tests/security/cross-origin-cached-scripts-parallel.html (205907 => 205908)
--- trunk/LayoutTests/http/tests/security/cross-origin-cached-scripts-parallel.html 2016-09-14 16:23:00 UTC (rev 205907)
+++ trunk/LayoutTests/http/tests/security/cross-origin-cached-scripts-parallel.html 2016-09-14 16:40:13 UTC (rev 205908)
@@ -21,7 +21,9 @@
var messages = [];
window.addEventListener("message", function(event) {
messages.push(event.data);
- if (messages.length == 4) {
+ if (messages.length == 2)
+ secondTest();
+ else if (messages.length == 4) {
messages.sort();
messages.forEach((message) => {
document.getElementById('console').innerHTML += message + "<br/>";
@@ -34,18 +36,26 @@
var iframeURL8000 = "http://localhost:8000/security/resources/cross-origin-cached-resource-iframe.html";
var iframeURL8080 = "http://localhost:8080/security/resources/cross-origin-cached-resource-iframe.html";
-var allow8000Script1 = "http://127.0.0.1:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=100";
-var allow8000Script2 = "http://127.0.0.1:8080/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=100";
+var allow8000Script1 = "http://127.0.0.1:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=1000";
+var allow8000Script2 = "http://127.0.0.1:8080/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000&name=notify-loaded.js&delay=1000";
-document.getElementById('iframe1').src = "" + "#" +
- encodeURIComponent(JSON.stringify({node: "script", url: allow8000Script1, shouldPass: true, crossOrigin: "anonymous", id: 1}));
-document.getElementById('iframe2').src = "" + "#" +
- encodeURIComponent(JSON.stringify({node: "script", url: allow8000Script1, shouldPass: false, crossOrigin: "anonymous", id: 2}));
+function firstTest()
+{
+ document.getElementById('iframe1').src = "" + "#" +
+ encodeURIComponent(JSON.stringify({node: "script", url: allow8000Script1, shouldPass: true, crossOrigin: "anonymous", id: 1}));
+ document.getElementById('iframe2').src = "" + "#" +
+ encodeURIComponent(JSON.stringify({node: "script", url: allow8000Script1, shouldPass: false, crossOrigin: "anonymous", id: 2}));
+}
-document.getElementById('iframe3').src = "" + "#" +
- encodeURIComponent(JSON.stringify({node: "script", url: allow8000Script2, shouldPass:true, id: 3}));
-document.getElementById('iframe4').src = "" + "#" +
- encodeURIComponent(JSON.stringify({node: "script", url: allow8000Script2, shouldPass:false, crossOrigin: "anonymous", id: 4}));
+function secondTest()
+{
+ document.getElementById('iframe3').src = "" + "#" +
+ encodeURIComponent(JSON.stringify({node: "script", url: allow8000Script2, shouldPass:true, id: 3}));
+ document.getElementById('iframe4').src = "" + "#" +
+ encodeURIComponent(JSON.stringify({node: "script", url: allow8000Script2, shouldPass:false, crossOrigin: "anonymous", id: 4}));
+}
+
+firstTest();
</script>
</body>
</html>
