[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:31:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 48f7d5c483442de8d738205b77891471602a392f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 17 21:47:00 2010 +0000
2010-09-17 Mihai Parparita <mihaip at chromium.org>
Reviewed by Dimitri Glazkov.
http/tests/navigation/post-goback1.html should not be a pixel test
https://bugs.webkit.org/show_bug.cgi?id=45834
Convert post-goback1.html to be a simpler dumpAsText test. It can use
the form-target.pl that was added r67466 with some small modifications.
To be extra safe, clear the back forward list for all the tests that
were converted to use dumpAsText.
* http/tests/navigation/post-basic.html:
* http/tests/navigation/post-frames.html:
* http/tests/navigation/post-goback1-expected.txt: Added.
* http/tests/navigation/post-goback1.html:
* http/tests/navigation/resources/form-target.pl:
* http/tests/navigation/resources/go-back.html: Added.
* platform/chromium-linux/http/tests/navigation/post-goback1-expected.checksum: Removed.
* platform/chromium-linux/http/tests/navigation/post-goback1-expected.png: Removed.
* platform/chromium-win/http/tests/navigation/post-goback1-expected.checksum: Removed.
* platform/chromium-win/http/tests/navigation/post-goback1-expected.png: Removed.
* platform/chromium/test_expectations.txt:
* platform/mac/http/tests/navigation/post-goback1-expected.checksum: Removed.
* platform/mac/http/tests/navigation/post-goback1-expected.png: Removed.
* platform/mac/http/tests/navigation/post-goback1-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c614de7..424c38e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,31 @@
+2010-09-17 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ http/tests/navigation/post-goback1.html should not be a pixel test
+ https://bugs.webkit.org/show_bug.cgi?id=45834
+
+ Convert post-goback1.html to be a simpler dumpAsText test. It can use
+ the form-target.pl that was added r67466 with some small modifications.
+
+ To be extra safe, clear the back forward list for all the tests that
+ were converted to use dumpAsText.
+
+ * http/tests/navigation/post-basic.html:
+ * http/tests/navigation/post-frames.html:
+ * http/tests/navigation/post-goback1-expected.txt: Added.
+ * http/tests/navigation/post-goback1.html:
+ * http/tests/navigation/resources/form-target.pl:
+ * http/tests/navigation/resources/go-back.html: Added.
+ * platform/chromium-linux/http/tests/navigation/post-goback1-expected.checksum: Removed.
+ * platform/chromium-linux/http/tests/navigation/post-goback1-expected.png: Removed.
+ * platform/chromium-win/http/tests/navigation/post-goback1-expected.checksum: Removed.
+ * platform/chromium-win/http/tests/navigation/post-goback1-expected.png: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/mac/http/tests/navigation/post-goback1-expected.checksum: Removed.
+ * platform/mac/http/tests/navigation/post-goback1-expected.png: Removed.
+ * platform/mac/http/tests/navigation/post-goback1-expected.txt: Removed.
+
2010-09-17 Eric Carlson <eric.carlson at apple.com>
Rubber-stamped by Simon Fraser.
diff --git a/LayoutTests/http/tests/navigation/post-basic.html b/LayoutTests/http/tests/navigation/post-basic.html
index ffd1363..927ff2d 100644
--- a/LayoutTests/http/tests/navigation/post-basic.html
+++ b/LayoutTests/http/tests/navigation/post-basic.html
@@ -2,6 +2,7 @@
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.waitUntilDone();
+ layoutTestController.clearBackForwardList();
layoutTestController.dumpBackForwardList();
}
window.location.href = 'resources/page-that-posts.html';
diff --git a/LayoutTests/http/tests/navigation/post-frames.html b/LayoutTests/http/tests/navigation/post-frames.html
index 59d5c6c..4a0b3d6 100644
--- a/LayoutTests/http/tests/navigation/post-frames.html
+++ b/LayoutTests/http/tests/navigation/post-frames.html
@@ -3,6 +3,7 @@
layoutTestController.dumpAsText();
layoutTestController.dumpChildFramesAsText();
layoutTestController.waitUntilDone();
+ layoutTestController.clearBackForwardList();
layoutTestController.dumpBackForwardList();
}
</script>
diff --git a/LayoutTests/http/tests/navigation/post-goback1-expected.txt b/LayoutTests/http/tests/navigation/post-goback1-expected.txt
new file mode 100644
index 0000000..637dfed
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/post-goback1-expected.txt
@@ -0,0 +1,12 @@
+This page was requested with the HTTP method POST.
+
+Parameters:
+
+the-input = input value goes here
+submitwithpost = Submit with POST
+
+============== Back Forward List ==============
+ http://127.0.0.1:8000/navigation/resources/page-that-posts.html **nav target**
+curr-> http://127.0.0.1:8000/navigation/resources/form-target.pl **nav target**
+ http://127.0.0.1:8000/navigation/resources/go-back.html **nav target**
+===============================================
diff --git a/LayoutTests/http/tests/navigation/post-goback1.html b/LayoutTests/http/tests/navigation/post-goback1.html
index 61c70ce..b8a63f5 100644
--- a/LayoutTests/http/tests/navigation/post-goback1.html
+++ b/LayoutTests/http/tests/navigation/post-goback1.html
@@ -1,6 +1,12 @@
-<script type="text/javascript" src="resources/testcode.js"></script>
<script>
- runBackTest("resources/success200.html", 1, "post");
-</script>
-This page just kicks off a test, and should not appear in the expected test output.
-The files in the resources dir have comments about the tests.
+ sessionStorage.formTargetShouldNavAndGoBack = true;
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ layoutTestController.clearBackForwardList();
+ layoutTestController.dumpBackForwardList();
+ }
+ window.location.href = 'resources/page-that-posts.html';
+</script>
+
+<p>Tests that POST-ing a page, navigating to another page and then going back is handled correctly. If this test passes, you will see a page indicating a form was POSTed.</p>
diff --git a/LayoutTests/http/tests/navigation/resources/form-target.pl b/LayoutTests/http/tests/navigation/resources/form-target.pl
index dd3365d..88887a1 100755
--- a/LayoutTests/http/tests/navigation/resources/form-target.pl
+++ b/LayoutTests/http/tests/navigation/resources/form-target.pl
@@ -5,7 +5,6 @@ use CGI;
$query = new CGI;
print "Content-type: text/html\r\n";
-print "Cache-Control: no-store, no-cache, must-revalidate\r\n";
print "\r\n";
$method = $query->request_method();
@@ -28,8 +27,23 @@ foreach $paramName (@paramNames)
print <<FOOTER
</ul>
<script>
-if (window.layoutTestController)
+var isDone = true;
+if (sessionStorage.formTargetShouldNavAndGoBack) {
+ if (sessionStorage.didNav) {
+ delete sessionStorage.didNav;
+ delete sessionStorage.formTargetShouldNavAndGoBack;
+ } else {
+ isDone = false;
+ sessionStorage.didNav = true;
+ onload = function() {
+ setTimeout(function() {window.location.href = 'go-back.html'}, 0);
+ };
+ }
+}
+
+if (isDone && window.layoutTestController)
layoutTestController.notifyDone();
+
</script>
</body>
FOOTER
diff --git a/LayoutTests/http/tests/navigation/resources/go-back.html b/LayoutTests/http/tests/navigation/resources/go-back.html
new file mode 100644
index 0000000..3b04202
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/resources/go-back.html
@@ -0,0 +1,5 @@
+<html>
+<body onload="history.back()">
+This is just a minimal page that we navigate to as part of testing back/forward.
+</body>
+</html>
diff --git a/LayoutTests/platform/chromium-linux/http/tests/navigation/post-goback1-expected.checksum b/LayoutTests/platform/chromium-linux/http/tests/navigation/post-goback1-expected.checksum
deleted file mode 100644
index 2fbd72a..0000000
--- a/LayoutTests/platform/chromium-linux/http/tests/navigation/post-goback1-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-5bb5541e5d25864150b0e121409b2482
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/http/tests/navigation/post-goback1-expected.png b/LayoutTests/platform/chromium-linux/http/tests/navigation/post-goback1-expected.png
deleted file mode 100644
index 83c9f92..0000000
Binary files a/LayoutTests/platform/chromium-linux/http/tests/navigation/post-goback1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/http/tests/navigation/post-goback1-expected.checksum b/LayoutTests/platform/chromium-win/http/tests/navigation/post-goback1-expected.checksum
deleted file mode 100644
index 6a78e5d..0000000
--- a/LayoutTests/platform/chromium-win/http/tests/navigation/post-goback1-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-12b1ec9c8dc83c0532745bdddb8b5bf7
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/http/tests/navigation/post-goback1-expected.png b/LayoutTests/platform/chromium-win/http/tests/navigation/post-goback1-expected.png
deleted file mode 100644
index 85bcac5..0000000
Binary files a/LayoutTests/platform/chromium-win/http/tests/navigation/post-goback1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 6d27635..edb2957 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -660,11 +660,6 @@ BUG21901 : plugins/npruntime/enumerate.html = FAIL
// it doesn't need to block the current release
BUG10275 : http/tests/security/cross-frame-access-put.html = FAIL
-// Due to differences in error pages. Needs re-baselining.
-BUG24208 WIN DEBUG : http/tests/navigation/post-goback1.html = FAIL
-BUG24208 SLOW WIN RELEASE : http/tests/navigation/post-goback1.html = FAIL
-BUG24208 LINUX MAC : http/tests/navigation/post-goback1.html = FAIL
-
// Requires layoutTestController.dispatchPendingLoadRequests
BUG33211 WIN RELEASE : http/tests/loading/deleted-host-in-resource-load-delegate-callback.html = TIMEOUT CRASH
BUG33211 WIN DEBUG : http/tests/loading/deleted-host-in-resource-load-delegate-callback.html = TIMEOUT
diff --git a/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.checksum b/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.checksum
deleted file mode 100644
index 017ffd4..0000000
--- a/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-4f4db8afb677fbfbed3c06781e347777
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.png b/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.png
deleted file mode 100644
index 9b9c201..0000000
Binary files a/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.txt b/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.txt
deleted file mode 100644
index 62479e9..0000000
--- a/LayoutTests/platform/mac/http/tests/navigation/post-goback1-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderText {#text} at (0,0) size 747x74
- text run at (0,0) width 747: "This is just a minimal page that we navigate in response to"
- text run at (0,37) width 222: "an HTTP POST. "
- RenderBR {BR} at (0,0) size 0x0
- RenderBR {BR} at (0,74) size 0x37
- RenderText {#text} at (0,111) size 763x111
- text run at (0,111) width 743: "If the next line is empty after the colon, it probably means"
- text run at (0,148) width 178: "that we made "
- text run at (178,148) width 585: "a mistake and requested this page with a GET"
- text run at (0,185) width 436: "with no query instead of a POST. "
- RenderBR {BR} at (0,0) size 0x0
- RenderBR {BR} at (0,222) size 0x37
- RenderText {#text} at (0,259) size 709x37
- text run at (0,259) width 709: "The first text field contained: New form text from user "
- RenderBR {BR} at (0,0) size 0x0
- RenderText {#text} at (0,296) size 591x37
- text run at (0,296) width 591: "This page was requested with an HTTP POST"
-
-============== Back Forward List ==============
- http://127.0.0.1:8000/navigation/post-goback1.html **nav target**
- http://127.0.0.1:8000/navigation/resources/success200.html **nav target**
-curr-> http://127.0.0.1:8000/navigation/resources/postresult.pl **nav target**
- http://127.0.0.1:8000/navigation/resources/otherpage.html **nav target**
-===============================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list