[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

hamaji at chromium.org hamaji at chromium.org
Wed Apr 7 23:44:59 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 23b741ec24e0fb418b0882e242aa9e47fb8d4469
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 17 09:36:45 2009 +0000

    2009-11-17  Yuta Kitamura  <yutak at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Fix http tests so that they do not submit a GET form to about:blank.
    
            Original tests expected that submitting an empty form to <about:blank> navigates
            the browser to <about:blank?>, not <about:blank>. However, some other browsers
            do not act like Safari, and in fact the layout test runner of Chromium was
            failing to run these tests.
    
            Prior to this patch, a test that only checks this behavior was added, so now
            we can remove the dependency on it from these tests.
    
            Some HTTP tests submit a GET form to about:blank
            https://bugs.webkit.org/show_bug.cgi?id=30423
    
            * http/tests/navigation/onload-navigation-iframe-2-expected.txt:
            * http/tests/navigation/onload-navigation-iframe-2.html:
            * http/tests/navigation/onload-navigation-iframe-expected.txt:
            * http/tests/navigation/onload-navigation-iframe-timeout-expected.txt:
            * http/tests/navigation/onload-navigation-iframe-timeout.html:
            * http/tests/navigation/onload-navigation-iframe.html:
            * http/tests/navigation/resources/blank.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 910d1e5..7215c51 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,30 @@
 2009-11-17  Yuta Kitamura  <yutak at chromium.org>
 
+        Reviewed by Eric Seidel.
+
+        Fix http tests so that they do not submit a GET form to about:blank.
+        
+        Original tests expected that submitting an empty form to <about:blank> navigates
+        the browser to <about:blank?>, not <about:blank>. However, some other browsers
+        do not act like Safari, and in fact the layout test runner of Chromium was
+        failing to run these tests.
+        
+        Prior to this patch, a test that only checks this behavior was added, so now
+        we can remove the dependency on it from these tests.
+
+        Some HTTP tests submit a GET form to about:blank
+        https://bugs.webkit.org/show_bug.cgi?id=30423
+
+        * http/tests/navigation/onload-navigation-iframe-2-expected.txt:
+        * http/tests/navigation/onload-navigation-iframe-2.html:
+        * http/tests/navigation/onload-navigation-iframe-expected.txt:
+        * http/tests/navigation/onload-navigation-iframe-timeout-expected.txt:
+        * http/tests/navigation/onload-navigation-iframe-timeout.html:
+        * http/tests/navigation/onload-navigation-iframe.html:
+        * http/tests/navigation/resources/blank.txt: Added.
+
+2009-11-17  Yuta Kitamura  <yutak at chromium.org>
+
         Reviewed by Darin Adler.
 
         Add a test to check the behavior of submitting a GET form to <about:blank>.
diff --git a/LayoutTests/http/tests/navigation/onload-navigation-iframe-2-expected.txt b/LayoutTests/http/tests/navigation/onload-navigation-iframe-2-expected.txt
index 09e0f6b..03d3e1e 100644
--- a/LayoutTests/http/tests/navigation/onload-navigation-iframe-2-expected.txt
+++ b/LayoutTests/http/tests/navigation/onload-navigation-iframe-2-expected.txt
@@ -2,5 +2,5 @@ In this case, Safari and Firefox don't add a history item.
 
 ============== Back Forward List ==============
 curr->  http://127.0.0.1:8000/navigation/onload-navigation-iframe-2.html  **nav target**
-            about:blank? (in frame "myFrame")
+            http://127.0.0.1:8000/navigation/resources/blank.txt? (in frame "myFrame")
 ===============================================
diff --git a/LayoutTests/http/tests/navigation/onload-navigation-iframe-2.html b/LayoutTests/http/tests/navigation/onload-navigation-iframe-2.html
index 29d7936..27f6a40 100644
--- a/LayoutTests/http/tests/navigation/onload-navigation-iframe-2.html
+++ b/LayoutTests/http/tests/navigation/onload-navigation-iframe-2.html
@@ -24,7 +24,7 @@ function frameLoaded()
 </script>
 </head>
 <body onload="runTest();">
-<form id="myForm" target="myFrame" action="about:blank" method="get">
+<form id="myForm" target="myFrame" action="resources/blank.txt" method="get">
 </form>
 In this case, Safari and Firefox don't add a history item. 
 <iframe name="myFrame" id="myFrame" onload="frameLoaded()"></iframe>
diff --git a/LayoutTests/http/tests/navigation/onload-navigation-iframe-expected.txt b/LayoutTests/http/tests/navigation/onload-navigation-iframe-expected.txt
index d550180..68a47a4 100644
--- a/LayoutTests/http/tests/navigation/onload-navigation-iframe-expected.txt
+++ b/LayoutTests/http/tests/navigation/onload-navigation-iframe-expected.txt
@@ -3,5 +3,5 @@ In this case, Safari and Firefox don't add a history item.
 
 ============== Back Forward List ==============
 curr->  http://127.0.0.1:8000/navigation/onload-navigation-iframe.html  **nav target**
-            about:blank? (in frame "myFrame")
+            http://127.0.0.1:8000/navigation/resources/blank.txt? (in frame "myFrame")
 ===============================================
diff --git a/LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout-expected.txt b/LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout-expected.txt
index a8445f4..b27919c 100644
--- a/LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout-expected.txt
+++ b/LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout-expected.txt
@@ -5,5 +5,5 @@ In this case, Safari and Firefox adds a history item but IE doesn't.
         http://127.0.0.1:8000/navigation/onload-navigation-iframe-timeout.html  **nav target**
             about:blank (in frame "myFrame")
 curr->  http://127.0.0.1:8000/navigation/onload-navigation-iframe-timeout.html
-            about:blank? (in frame "myFrame")  **nav target**
+            http://127.0.0.1:8000/navigation/resources/blank.txt? (in frame "myFrame")  **nav target**
 ===============================================
diff --git a/LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html b/LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html
index ff0e43f..e2c581e 100644
--- a/LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html
+++ b/LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html
@@ -38,7 +38,7 @@ function frameLoaded()
 </script>
 </head>
 <body onload="runTest()">
-<form id="myForm" target="myFrame" action="about:blank" method="get">
+<form id="myForm" target="myFrame" action="resources/blank.txt" method="get">
 </form>
 In this case, Safari and Firefox adds a history item but IE doesn't.
 </body>
diff --git a/LayoutTests/http/tests/navigation/onload-navigation-iframe.html b/LayoutTests/http/tests/navigation/onload-navigation-iframe.html
index 9a77f69..c5c01bf 100644
--- a/LayoutTests/http/tests/navigation/onload-navigation-iframe.html
+++ b/LayoutTests/http/tests/navigation/onload-navigation-iframe.html
@@ -35,7 +35,7 @@ function frameLoaded()
 </script>
 </head>
 <body onload="runTest();">
-<form id="myForm" target="myFrame" action="about:blank" method="get">
+<form id="myForm" target="myFrame" action="resources/blank.txt" method="get">
 </form>
 In this case, Safari and Firefox don't add a history item. 
 </body>
diff --git a/BugsSite/data/mail b/LayoutTests/http/tests/navigation/resources/blank.txt
similarity index 100%
copy from BugsSite/data/mail
copy to LayoutTests/http/tests/navigation/resources/blank.txt

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list