Diff
Modified: trunk/LayoutTests/ChangeLog (177282 => 177283)
--- trunk/LayoutTests/ChangeLog 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/ChangeLog 2014-12-15 18:02:46 UTC (rev 177283)
@@ -1,3 +1,28 @@
+2014-12-15 Alexey Proskuryakov <[email protected]>
+
+ http/tests/misc/webtiming-origins.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=91314
+
+ Reviewed by Anders Carlsson.
+
+ This test had three subframes, each being an individual test with waitUntilDone/notifyDone.
+ How crazy was that?
+
+ * http/tests/misc/resources/webtiming-cross-origin-and-back1.html: Removed.
+ * http/tests/misc/resources/webtiming-cross-origin-redirect.php: Removed.
+ * http/tests/misc/resources/webtiming-no-origin.html: Removed.
+ * http/tests/misc/webtiming-cross-origin-and-back1-expected.txt: Added.
+ * http/tests/misc/webtiming-cross-origin-and-back1.html: Copied from LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html.
+ * http/tests/misc/webtiming-cross-origin-redirect-expected.txt: Added.
+ * http/tests/misc/webtiming-cross-origin-redirect.php: Copied from LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php.
+ * http/tests/misc/webtiming-no-origin-expected.txt: Added.
+ * http/tests/misc/webtiming-no-origin.html: Copied from LayoutTests/http/tests/misc/resources/webtiming-no-origin.html.
+ * http/tests/misc/webtiming-origins.html: Removed.
+ * platform/gtk/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+ * platform/wincairo/TestExpectations:
+
2014-12-15 Bartlomiej Gajda <[email protected]>
[MSE] Prevent SourceBuffer monitoring algorithm from triggering a HAVE_NOTHING to HAVE_METADATA transition.
Deleted: trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html (177282 => 177283)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html 2014-12-15 18:02:46 UTC (rev 177283)
@@ -1,15 +0,0 @@
-<html>
-<head>
-<script src=""
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-function doRedirect() {
- window.location = "http://127.0.0.1:8000/misc/resources/webtiming-cross-origin-and-back-redirect1.php";
-}
-addEventListener("load", setTimeout(doRedirect, 0));
-</script>
-</head>
-<body>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php (177282 => 177283)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php 2014-12-15 18:02:46 UTC (rev 177283)
@@ -1,5 +0,0 @@
-<?php
- // Tests run from 127.0.0.1, so localhost will appear to be a different origin.
- header('Location: http://localhost:8080/misc/resources/webtiming-cross-origin-redirect.html');
- header('HTTP/1.0 302 Found');
-?>
Deleted: trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html (177282 => 177283)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html 2014-12-15 18:02:46 UTC (rev 177283)
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Web Timing should report zeros for redirects and unload since there was no preceding page.");
-
-window.performance = window.performance || {};
-var navigation = performance.navigation || {};
-var timing = performance.timing || {};
-
-function performTest() {
- // FIXME: Need a way to synchronize the test so that loadEventEnd is non-zero.
- var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "secureConnectionStart", "unloadEventStart", "unloadEventEnd"];
-
- var timingProperties = new Array;
- for (var property in timing) {
- timingProperties.push(property);
- }
- timingProperties.sort();
- for (var i = 0; i < timingProperties.length; ++i) {
- if (shouldBeZeroList.indexOf(timingProperties[i]) >= 0)
- shouldBe("timing." + timingProperties[i], "0");
- else
- shouldBeNonZero("timing." + timingProperties[i]);
- }
- shouldBe("navigation.redirectCount", "0");
-
- finishJSTest();
-}
-
-window.addEventListener("load", performTest);
-
-var jsTestIsAsync = true;
-</script>
-<script src=""
-</body>
-</html>
Added: trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1-expected.txt (0 => 177283)
--- trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1-expected.txt 2014-12-15 18:02:46 UTC (rev 177283)
@@ -0,0 +1,31 @@
+If the destination and previous page have the same origin, then Web Timing should report unload timing.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS timing.connectEnd is non-zero.
+PASS timing.connectStart is non-zero.
+PASS timing.domComplete is non-zero.
+PASS timing.domContentLoadedEventEnd is non-zero.
+PASS timing.domContentLoadedEventStart is non-zero.
+PASS timing.domInteractive is non-zero.
+PASS timing.domLoading is non-zero.
+PASS timing.domainLookupEnd is non-zero.
+PASS timing.domainLookupStart is non-zero.
+PASS timing.fetchStart is non-zero.
+PASS timing.loadEventEnd is 0
+PASS timing.loadEventStart is non-zero.
+PASS timing.navigationStart is non-zero.
+PASS timing.redirectEnd is 0
+PASS timing.redirectStart is 0
+PASS timing.requestStart is non-zero.
+PASS timing.responseEnd is non-zero.
+PASS timing.responseStart is non-zero.
+PASS timing.secureConnectionStart is 0
+PASS timing.unloadEventEnd is 0
+PASS timing.unloadEventStart is 0
+PASS navigation.redirectCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1.html (from rev 177279, trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html) (0 => 177283)
--- trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1.html (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1.html 2014-12-15 18:02:46 UTC (rev 177283)
@@ -0,0 +1,15 @@
+<html>
+<head>
+<script src=""
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+function doRedirect() {
+ window.location = "http://127.0.0.1:8000/misc/resources/webtiming-cross-origin-and-back-redirect1.php";
+}
+addEventListener("load", setTimeout(doRedirect, 0));
+</script>
+</head>
+<body>
+</body>
+</html>
Added: trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect-expected.txt (0 => 177283)
--- trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect-expected.txt 2014-12-15 18:02:46 UTC (rev 177283)
@@ -0,0 +1,31 @@
+Web Timing should zero out redirect stats after a cross-origin redirect.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS timing.connectEnd is non-zero.
+PASS timing.connectStart is non-zero.
+PASS timing.domComplete is non-zero.
+PASS timing.domContentLoadedEventEnd is non-zero.
+PASS timing.domContentLoadedEventStart is non-zero.
+PASS timing.domInteractive is non-zero.
+PASS timing.domLoading is non-zero.
+PASS timing.domainLookupEnd is non-zero.
+PASS timing.domainLookupStart is non-zero.
+PASS timing.fetchStart is non-zero.
+PASS timing.loadEventEnd is 0
+PASS timing.loadEventStart is non-zero.
+PASS timing.navigationStart is non-zero.
+PASS timing.redirectEnd is 0
+PASS timing.redirectStart is 0
+PASS timing.requestStart is non-zero.
+PASS timing.responseEnd is non-zero.
+PASS timing.responseStart is non-zero.
+PASS timing.secureConnectionStart is 0
+PASS timing.unloadEventEnd is 0
+PASS timing.unloadEventStart is 0
+PASS navigation.redirectCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect.php (from rev 177279, trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php) (0 => 177283)
--- trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect.php (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect.php 2014-12-15 18:02:46 UTC (rev 177283)
@@ -0,0 +1,5 @@
+<?php
+ // Tests run from 127.0.0.1, so localhost will appear to be a different origin.
+ header('Location: http://localhost:8080/misc/resources/webtiming-cross-origin-redirect.html');
+ header('HTTP/1.0 302 Found');
+?>
Added: trunk/LayoutTests/http/tests/misc/webtiming-no-origin-expected.txt (0 => 177283)
--- trunk/LayoutTests/http/tests/misc/webtiming-no-origin-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-no-origin-expected.txt 2014-12-15 18:02:46 UTC (rev 177283)
@@ -0,0 +1,31 @@
+Web Timing should report zeros for redirects and unload since there was no preceding page.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS timing.connectEnd is non-zero.
+PASS timing.connectStart is non-zero.
+PASS timing.domComplete is non-zero.
+PASS timing.domContentLoadedEventEnd is non-zero.
+PASS timing.domContentLoadedEventStart is non-zero.
+PASS timing.domInteractive is non-zero.
+PASS timing.domLoading is non-zero.
+PASS timing.domainLookupEnd is non-zero.
+PASS timing.domainLookupStart is non-zero.
+PASS timing.fetchStart is non-zero.
+PASS timing.loadEventEnd is 0
+PASS timing.loadEventStart is non-zero.
+PASS timing.navigationStart is non-zero.
+PASS timing.redirectEnd is 0
+PASS timing.redirectStart is 0
+PASS timing.requestStart is non-zero.
+PASS timing.responseEnd is non-zero.
+PASS timing.responseStart is non-zero.
+PASS timing.secureConnectionStart is 0
+PASS timing.unloadEventEnd is 0
+PASS timing.unloadEventStart is 0
+PASS navigation.redirectCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/http/tests/misc/webtiming-no-origin.html (from rev 177279, trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html) (0 => 177283)
--- trunk/LayoutTests/http/tests/misc/webtiming-no-origin.html (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-no-origin.html 2014-12-15 18:02:46 UTC (rev 177283)
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description("Web Timing should report zeros for redirects and unload since there was no preceding page.");
+
+window.performance = window.performance || {};
+var navigation = performance.navigation || {};
+var timing = performance.timing || {};
+
+function performTest() {
+ // FIXME: Need a way to synchronize the test so that loadEventEnd is non-zero.
+ var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "secureConnectionStart", "unloadEventStart", "unloadEventEnd"];
+
+ var timingProperties = new Array;
+ for (var property in timing) {
+ timingProperties.push(property);
+ }
+ timingProperties.sort();
+ for (var i = 0; i < timingProperties.length; ++i) {
+ if (shouldBeZeroList.indexOf(timingProperties[i]) >= 0)
+ shouldBe("timing." + timingProperties[i], "0");
+ else
+ shouldBeNonZero("timing." + timingProperties[i]);
+ }
+ shouldBe("navigation.redirectCount", "0");
+
+ finishJSTest();
+}
+
+window.addEventListener("load", performTest);
+
+var jsTestIsAsync = true;
+</script>
+<script src=""
+</body>
+</html>
Deleted: trunk/LayoutTests/http/tests/misc/webtiming-origins.html (177282 => 177283)
--- trunk/LayoutTests/http/tests/misc/webtiming-origins.html 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/http/tests/misc/webtiming-origins.html 2014-12-15 18:02:46 UTC (rev 177283)
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpChildFramesAsText();
-}
-</script>
-</head>
-<body>
-<iframe width="640" height="480" src=""
-<iframe width="640" height="480" src=""
-<iframe width="640" height="480" src=""
-</body>
-</html>
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (177282 => 177283)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-12-15 18:02:46 UTC (rev 177283)
@@ -653,8 +653,6 @@
webkit.org/b/61121 http/tests/appcache/interrupted-update.html [ Failure Pass ]
-webkit.org/b/91314 http/tests/misc/webtiming-origins.html [ Failure Pass ]
-
webkit.org/b/94119 storage/websql/database-lock-after-reload.html [ Failure Pass ]
webkit.org/b/132283 storage/websql/read-transactions-running-concurrently.html [ Failure Pass ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (177282 => 177283)
--- trunk/LayoutTests/platform/mac/TestExpectations 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-12-15 18:02:46 UTC (rev 177283)
@@ -905,20 +905,22 @@
webkit.org/b/132385 compositing/repaint/repaint-on-layer-grouping-change.html [ Pass Failure ]
# Mavericks and prior do not support web timing.
-[ MountainLion Mavericks ] fast/dom/Window/window-properties-performance.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/Window/web-timing-minimal-performance-now.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/navigation-type-back-forward.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/navigation-type-navigate.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/navigation-type-reload.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/webtiming.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/webtiming-document-open.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/webtiming-navigate-within-document.html [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-origins.html [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-one-redirect.php [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-slow-load.php [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-ssl.php [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-two-redirects.php [ Skip ]
-[ MountainLion Mavericks ] fast/performance [ Skip ]
+[ MountainLion Mavericks ] fast/dom/navigation-type-back-forward.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/navigation-type-navigate.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/navigation-type-reload.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/webtiming-document-open.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/webtiming-navigate-within-document.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/webtiming.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/Window/web-timing-minimal-performance-now.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/Window/window-properties-performance.html [ WontFix ]
+[ MountainLion Mavericks ] fast/performance [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-cross-origin-and-back1.html [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-cross-origin-redirect.php [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-no-origin.html [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-one-redirect.php [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-slow-load.php [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-ssl.php [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-two-redirects.php [ WontFix ]
# This test, originally written for Chromium, historically was not testing anything on Mac because
# resizing didn't work. Now the test fails. I believe this bug was never fixed for the Mac port.
Modified: trunk/LayoutTests/platform/win/TestExpectations (177282 => 177283)
--- trunk/LayoutTests/platform/win/TestExpectations 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-12-15 18:02:46 UTC (rev 177283)
@@ -1177,21 +1177,23 @@
fast/forms/validation-message-on-textarea.html
# Web Timing is not enabled.
+webkit.org/b/42435 fast/dom/Window/web-timing-minimal-performance-now.html [ Timeout Failure ]
webkit.org/b/42435 fast/dom/Window/window-properties-performance.html [ Failure ]
-webkit.org/b/42435 fast/dom/Window/web-timing-minimal-performance-now.html [ Timeout Failure ]
webkit.org/b/42435 fast/dom/navigation-type-back-forward.html [ Failure ]
webkit.org/b/42435 fast/dom/navigation-type-navigate.html [ Failure ]
webkit.org/b/42435 fast/dom/navigation-type-reload.html [ Failure ]
-webkit.org/b/42435 fast/dom/webtiming.html [ Failure ]
webkit.org/b/42435 fast/dom/webtiming-document-open.html [ Failure ]
webkit.org/b/42435 fast/dom/webtiming-navigate-within-document.html [ Failure ]
-webkit.org/b/42435 http/tests/misc/webtiming-origins.html [ Failure ]
+webkit.org/b/42435 fast/dom/webtiming.html [ Failure ]
+webkit.org/b/42435 fast/performance/ [ Failure ]
+webkit.org/b/42435 http/tests/misc/webtiming-cross-origin-and-back1.html [ Failure ]
+webkit.org/b/42435 http/tests/misc/webtiming-cross-origin-redirect.php [ Failure ]
+webkit.org/b/42435 http/tests/misc/webtiming-no-origin.html [ Failure ]
webkit.org/b/42435 http/tests/misc/webtiming-one-redirect.php [ Failure ]
webkit.org/b/42435 http/tests/misc/webtiming-slow-load.php [ Failure ]
webkit.org/b/42435 http/tests/misc/webtiming-ssl.php [ Failure ]
webkit.org/b/42435 http/tests/misc/webtiming-two-redirects.php [ Failure ]
webkit.org/b/42435 http/tests/w3c/webperf [ Failure ]
-webkit.org/b/42435 fast/performance/ [ Failure ]
# Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
webkit.org/b/85558 http/tests/security/contentSecurityPolicy/1.1 [ Timeout Crash Pass Failure ]
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (177282 => 177283)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2014-12-15 18:02:46 UTC (rev 177283)
@@ -1731,7 +1731,9 @@
fast/dom/webtiming.html
fast/dom/webtiming-document-open.html
fast/dom/webtiming-navigate-within-document.html
-http/tests/misc/webtiming-origins.html
+http/tests/misc/webtiming-cross-origin-and-back1.html
+http/tests/misc/webtiming-cross-origin-redirect.php
+http/tests/misc/webtiming-no-origin.html
http/tests/misc/webtiming-one-redirect.php
http/tests/misc/webtiming-slow-load.php
http/tests/misc/webtiming-ssl.php
