Title: [197107] releases/WebKitGTK/webkit-2.12/LayoutTests
- Revision
- 197107
- Author
- carlo...@webkit.org
- Date
- 2016-02-25 06:18:23 -0800 (Thu, 25 Feb 2016)
Log Message
Merge r196988 - REGRESSION (r192251): http/tests/navigation/page-cache-xhr.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=154589
Reviewed by Youenn Fablet.
* http/tests/navigation/page-cache-xhr.html: Load a file that exists. The content
doesn't matter, as we expect to navigate away before the load occurs.
* http/tests/resources/load-and-stall.cgi: Added cache control, just for a good measure.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (197106 => 197107)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-02-25 14:15:46 UTC (rev 197106)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-02-25 14:18:23 UTC (rev 197107)
@@ -1,3 +1,15 @@
+2016-02-23 Alexey Proskuryakov <a...@apple.com>
+
+ REGRESSION (r192251): http/tests/navigation/page-cache-xhr.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=154589
+
+ Reviewed by Youenn Fablet.
+
+ * http/tests/navigation/page-cache-xhr.html: Load a file that exists. The content
+ doesn't matter, as we expect to navigate away before the load occurs.
+
+ * http/tests/resources/load-and-stall.cgi: Added cache control, just for a good measure.
+
2016-02-23 Mark Lam <mark....@apple.com>
Debug assertion failure while loading http://kangax.github.io/compat-table/es6/.
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/http/tests/navigation/page-cache-xhr.html (197106 => 197107)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/http/tests/navigation/page-cache-xhr.html 2016-02-25 14:15:46 UTC (rev 197106)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/http/tests/navigation/page-cache-xhr.html 2016-02-25 14:18:23 UTC (rev 197107)
@@ -49,7 +49,7 @@
xhr._onload_ = xhrLoaded;
xhr._onerror_ = xhrError;
// Slow loading XHR (3-second stall).
- xhr.open("GET", "/resources/load-and-stall.cgi?name=../../../http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout.js&stallFor=3&stallAt=0&mimeType=text/plain", true);
+ xhr.open("GET", "/resources/load-and-stall.cgi?name=load-and-stall.cgi&stallFor=3&stallAt=0&mimeType=text/plain", true);
xhr.send();
// This needs to happen in a setTimeout because a navigation inside the onload handler would
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/http/tests/resources/load-and-stall.cgi (197106 => 197107)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/http/tests/resources/load-and-stall.cgi 2016-02-25 14:15:46 UTC (rev 197106)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/http/tests/resources/load-and-stall.cgi 2016-02-25 14:18:23 UTC (rev 197107)
@@ -11,6 +11,7 @@
$mimeType = $query->param('mimeType');
my $filesize = stat($name)->size;
+print "Cache-Control: no-store\n";
print "Content-type: " . $mimeType . "\n";
print "Content-Length: " . $filesize . "\n\n";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
