<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167601] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167601">167601</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 11:55:14 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>http/tests/cache/subresource-failover-to-network.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=131936
Reviewed by Brady Eidson.
The test was racy, because it was unintentionally queuing TestRunner operations
twice. Also, it failed to clean up its cookie.
Rewrote to not use TestRunner queuing, making the test work in browser.
* http/tests/cache/resources/subresource-failover-to-network.cgi:
* http/tests/cache/subresource-failover-to-network.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestscacheresourcessubresourcefailovertonetworkcgi">trunk/LayoutTests/http/tests/cache/resources/subresource-failover-to-network.cgi</a></li>
<li><a href="#trunkLayoutTestshttptestscachesubresourcefailovertonetworkhtml">trunk/LayoutTests/http/tests/cache/subresource-failover-to-network.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167600 => 167601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-21 18:43:01 UTC (rev 167600)
+++ trunk/LayoutTests/ChangeLog 2014-04-21 18:55:14 UTC (rev 167601)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-04-21 Alexey Proskuryakov <ap@apple.com>
+
+ http/tests/cache/subresource-failover-to-network.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=131936
+
+ Reviewed by Brady Eidson.
+
+ The test was racy, because it was unintentionally queuing TestRunner operations
+ twice. Also, it failed to clean up its cookie.
+
+ Rewrote to not use TestRunner queuing, making the test work in browser.
+
+ * http/tests/cache/resources/subresource-failover-to-network.cgi:
+ * http/tests/cache/subresource-failover-to-network.html:
+
</ins><span class="cx"> 2014-04-21 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Pagination mode messed up with non-inline axis and reversed direction.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcessubresourcefailovertonetworkcgi"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/resources/subresource-failover-to-network.cgi (167600 => 167601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/subresource-failover-to-network.cgi 2014-04-21 18:43:01 UTC (rev 167600)
+++ trunk/LayoutTests/http/tests/cache/resources/subresource-failover-to-network.cgi 2014-04-21 18:55:14 UTC (rev 167601)
</span><span class="lines">@@ -6,7 +6,6 @@
</span><span class="cx"> <script>
</span><span class="cx"> try {
</span><span class="cx"> var result = document.cookie.split(';')[0].split('=')[1];
</span><del>- document.cookie = "result=PASS"; // for next time
</del><span class="cx">
</span><span class="cx"> var r = new XMLHttpRequest();
</span><span class="cx"> r.open('POST', 'echo-no-store.cgi', false);
</span><span class="lines">@@ -15,5 +14,16 @@
</span><span class="cx"> } catch (e) {
</span><span class="cx"> document.write(e);
</span><span class="cx"> }
</span><ins>+if (!sessionStorage.subresourceFailoverToNetworkCGILoadedBefore) {
+ sessionStorage.subresourceFailoverToNetworkCGILoadedBefore = true;
+ document.cookie = "subresourceFailoverToNetwork=PASS"; // for next time
+ history.back();
+} else {
+ sessionStorage.removeItem("subresourceFailoverToNetworkLoadedBefore");
+ sessionStorage.removeItem("subresourceFailoverToNetworkCGILoadedBefore");
+ document.cookie = "subresourceFailoverToNetwork=; expires=Thu, 01 Jan 1970 00:00:01 GMT;";
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
</ins><span class="cx"> </script>
</span><span class="cx"> EOF
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachesubresourcefailovertonetworkhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/subresource-failover-to-network.html (167600 => 167601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/subresource-failover-to-network.html 2014-04-21 18:43:01 UTC (rev 167600)
+++ trunk/LayoutTests/http/tests/cache/subresource-failover-to-network.html 2014-04-21 18:55:14 UTC (rev 167601)
</span><span class="lines">@@ -1,19 +1,26 @@
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><del>- if ("testRunner" in window) {
- testRunner.dumpAsText();
</del><ins>+function test() {
+ if (!sessionStorage.subresourceFailoverToNetworkLoadedBefore) {
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+ sessionStorage.subresourceFailoverToNetworkLoadedBefore = true;
</ins><span class="cx">
</span><del>- document.cookie = "result=FAIL"
</del><ins>+ document.cookie = "subresourceFailoverToNetwork=FAIL";
</ins><span class="cx">
</span><span class="cx"> // The results of the form submission is a page that performs a non-
</span><span class="cx"> // cacheable sync XHR request. Upon returning to that page, we expect the
</span><span class="cx"> // sync XHR request to still succeed. This relies on it loading from the
</span><span class="cx"> // network and not being restricted to loading from the cache (as the main
</span><span class="cx"> // page is).
</span><del>- testRunner.queueLoadingScript("document.forms[0].submit()");
- testRunner.queueBackNavigation(1);
- testRunner.queueForwardNavigation(1);
- }
</del><ins>+ setTimeout( function() { document.forms[0].submit(); }, 0);
+ } else
+ history.forward();
+}
+
+onload = test;
</ins><span class="cx"> </script>
</span><span class="cx"> <form method="POST" action="resources/subresource-failover-to-network.cgi" enctype="multipart/form-data">
</span><span class="cx"> <input type="submit">
</span><span class="lines">@@ -27,4 +34,6 @@
</span><span class="cx"> is loaded with the ReturnCacheDataDontLoad cache policy. It is important that
</span><span class="cx"> subresources (including XMLHttpRequest instances) do not inherit this cache
</span><span class="cx"> policy.
</span><ins>+<p>
+This test doesn't work in browser, because it expects page cache to be disabled.
</ins><span class="cx"> </body>
</span></span></pre>
</div>
</div>
</body>
</html>