[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
darin at chromium.org
darin at chromium.org
Thu Apr 8 00:24:29 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit fb8f4e1e9631002901b590e30b456e320962b8e8
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 7 22:43:13 2009 +0000
2009-12-07 Darin Fisher <darin at chromium.org>
Reviewed by Darin Adler.
http/tests/cache/subresource-failover-to-network.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=32038
Rewrite test to avoid dumpResourceLoadCallbacks, which do not
interleave predictably with the output of dumpFrameLoadCallbacks.
Other things besides resource loading can delay onload.
The newly written test uses a cookie to determine if the test has
passed.
Unskip this test for platform/win.
* http/tests/cache/resources/subresource-failover-to-network.cgi:
* http/tests/cache/subresource-failover-to-network-expected.txt:
* http/tests/cache/subresource-failover-to-network.html:
* platform/win/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51798 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index efd5012..c9734b9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2009-12-07 Darin Fisher <darin at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ http/tests/cache/subresource-failover-to-network.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=32038
+
+ Rewrite test to avoid dumpResourceLoadCallbacks, which do not
+ interleave predictably with the output of dumpFrameLoadCallbacks.
+ Other things besides resource loading can delay onload.
+
+ The newly written test uses a cookie to determine if the test has
+ passed.
+
+ Unskip this test for platform/win.
+
+ * http/tests/cache/resources/subresource-failover-to-network.cgi:
+ * http/tests/cache/subresource-failover-to-network-expected.txt:
+ * http/tests/cache/subresource-failover-to-network.html:
+ * platform/win/Skipped:
+
2009-12-07 Alexey Proskuryakov <ap at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/http/tests/cache/resources/subresource-failover-to-network.cgi b/LayoutTests/http/tests/cache/resources/subresource-failover-to-network.cgi
index 834f5c4..6b70b71 100755
--- a/LayoutTests/http/tests/cache/resources/subresource-failover-to-network.cgi
+++ b/LayoutTests/http/tests/cache/resources/subresource-failover-to-network.cgi
@@ -5,9 +5,12 @@ print "\n";
print <<EOF
<script>
try {
+ var result = document.cookie.split(';')[0].split('=')[1];
+ document.cookie = "result=PASS"; // for next time
+
var r = new XMLHttpRequest();
r.open('POST', 'echo-no-store.cgi', false);
- r.send('PASS');
+ r.send(result);
document.write(r.responseText);
} catch (e) {
document.write(e);
diff --git a/LayoutTests/http/tests/cache/subresource-failover-to-network-expected.txt b/LayoutTests/http/tests/cache/subresource-failover-to-network-expected.txt
index 3aed1f3..7ef22e9 100644
--- a/LayoutTests/http/tests/cache/subresource-failover-to-network-expected.txt
+++ b/LayoutTests/http/tests/cache/subresource-failover-to-network-expected.txt
@@ -1,39 +1 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-<unknown> - didFinishLoading
-main frame - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi, main document URL http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi, http method POST> redirectResponse (null)
-http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi, http status code 200>
-main frame - didCommitLoadForFrame
-http://127.0.0.1:8000/cache/resources/echo-no-store.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/echo-no-store.cgi, main document URL http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi, http method POST> redirectResponse (null)
-http://127.0.0.1:8000/cache/resources/echo-no-store.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/resources/echo-no-store.cgi, http status code 200>
-http://127.0.0.1:8000/cache/resources/echo-no-store.cgi - didFinishLoading
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi - didFinishLoading
-main frame - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/cache/subresource-failover-to-network.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/subresource-failover-to-network.html, main document URL http://127.0.0.1:8000/cache/subresource-failover-to-network.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/cache/subresource-failover-to-network.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/subresource-failover-to-network.html, http status code 200>
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-http://127.0.0.1:8000/cache/subresource-failover-to-network.html - didFinishLoading
-main frame - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi, main document URL http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi, http method POST> redirectResponse (null)
-http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi, http status code 200>
-main frame - didCommitLoadForFrame
-http://127.0.0.1:8000/cache/resources/echo-no-store.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/echo-no-store.cgi, main document URL http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi, http method POST> redirectResponse (null)
-http://127.0.0.1:8000/cache/resources/echo-no-store.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/resources/echo-no-store.cgi, http status code 200>
-http://127.0.0.1:8000/cache/resources/echo-no-store.cgi - didFinishLoading
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
PASS
-
-============== Back Forward List ==============
- http://127.0.0.1:8000/cache/subresource-failover-to-network.html **nav target**
-curr-> http://127.0.0.1:8000/cache/resources/subresource-failover-to-network.cgi **nav target**
-===============================================
diff --git a/LayoutTests/http/tests/cache/subresource-failover-to-network.html b/LayoutTests/http/tests/cache/subresource-failover-to-network.html
index 5aa1050..db198eb 100644
--- a/LayoutTests/http/tests/cache/subresource-failover-to-network.html
+++ b/LayoutTests/http/tests/cache/subresource-failover-to-network.html
@@ -2,9 +2,8 @@
<script>
if ("layoutTestController" in window) {
layoutTestController.dumpAsText();
- layoutTestController.dumpBackForwardList();
- layoutTestController.dumpFrameLoadCallbacks();
- layoutTestController.dumpResourceLoadCallbacks();
+
+ document.cookie = "result=FAIL"
// The results of the form submission is a page that performs a non-
// cacheable sync XHR request. Upon returning to that page, we expect the
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 76afc0c..bf58cb5 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -720,9 +720,6 @@ http/tests/navigation/reload-subframe-iframe.html
http/tests/plugins/post-url-file.html
inspector/timeline-network-resource.html
-# https://bugs.webkit.org/show_bug.cgi?id=32038 - Flaky on Windows
-http/tests/cache/subresource-failover-to-network.html
-
# This test requires ogg codecs
media/media-can-play-ogg.html
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list