2009-04-02 Pamela Greene <pam@chromium.org>

        Reviewed by Darin Adler.

        Split no-port test case into separate file, since its result may
        depend on the behavior of a DNS proxy on some systems.
        https://bugs.webkit.org/show_bug.cgi?id=21530

        * platform/mac-tiger/security/block-test-expected.txt: updated
        * platform/mac-tiger/security/block-test-no-port-expected.txt: Added.
        * platform/mac/security/block-test-expected.txt: updated
        * platform/mac/security/block-test-no-port-expected.txt: Added.
        * security/block-test-no-port.html: Added.
        * security/block-test.html: removed no-port test case

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@42188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4a0c1ec5db9d503aee8b53f6770419fdc6420793..7b0496ecd94a3892a2c6ba6738b401fb8fc1b626 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2009-04-02  Pamela Greene  <pam@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Split no-port test case into separate file, since its result may
+        depend on the behavior of a DNS proxy on some systems.
+        https://bugs.webkit.org/show_bug.cgi?id=21530
+
+        * platform/mac-tiger/security/block-test-expected.txt: updated
+        * platform/mac-tiger/security/block-test-no-port-expected.txt: Added.
+        * platform/mac/security/block-test-expected.txt: updated
+        * platform/mac/security/block-test-no-port-expected.txt: Added.
+        * security/block-test-no-port.html: Added.
+        * security/block-test.html: removed no-port test case
+
 2009-04-02  David Hyatt  <hyatt@apple.com>
 
         Reviewed by Darin Adler

diff --git a/LayoutTests/platform/mac-tiger/security/block-test-expected.txt b/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
index 1a65e663a0b7241f2f60b0b672a7002861df436e..a86364b8d46eca388ecceedf6b8ec31ac28f52fb 100644 (file)
--- a/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
+++ b/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
@@ -1,9 +1,7 @@
-http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test.html> redirectResponse (null)
-<unknown> - didFinishLoading
 http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html> redirectResponse (null)
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSPOSIXErrorDomain, code 13, failing URL "http://255.255.255.255/test.jpg">
-http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
+<unknown> - didFinishLoading
 http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html> redirectResponse (null)
+http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
 http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
 http://255.255.255.255:9/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:9/test.jpg, main document URL block-test.html> redirectResponse (null)
 http://255.255.255.255:9/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:9/test.jpg">

diff --git a/LayoutTests/platform/mac-tiger/security/block-test-no-port-expected.txt b/LayoutTests/platform/mac-tiger/security/block-test-no-port-expected.txt
new file mode 100644 (file)
index 0000000..63db55b
--- /dev/null
+++ b/LayoutTests/platform/mac-tiger/security/block-test-no-port-expected.txt
@@ -0,0 +1,6 @@
+http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test-no-port.html> redirectResponse (null)
+<unknown> - didFinishLoading
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSPOSIXErrorDomain, code 13, failing URL "http://255.255.255.255/test.jpg">
+This test attempts to change the src of an IMG tag to a blocked IP with no port to confirm that WebKit returns the correct error for it - blocked instead of cannot find. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree. In addition, on some systems the results may depend on the behavior of the proxy.
+
+

diff --git a/LayoutTests/platform/mac/security/block-test-expected.txt b/LayoutTests/platform/mac/security/block-test-expected.txt
index dcf64bc26626e461152109f517929c8b8de12572..fd62a02d590211fa348b8f42fd9e20fa5a89b413 100644 (file)
--- a/LayoutTests/platform/mac/security/block-test-expected.txt
+++ b/LayoutTests/platform/mac/security/block-test-expected.txt
@@ -1,9 +1,7 @@
-http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test.html> redirectResponse (null)
-<unknown> - didFinishLoading
 http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html> redirectResponse (null)
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
-http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
+<unknown> - didFinishLoading
 http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html> redirectResponse (null)
+http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
 http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
 http://255.255.255.255:9/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:9/test.jpg, main document URL block-test.html> redirectResponse (null)
 http://255.255.255.255:9/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:9/test.jpg">

diff --git a/LayoutTests/platform/mac/security/block-test-no-port-expected.txt b/LayoutTests/platform/mac/security/block-test-no-port-expected.txt
new file mode 100644 (file)
index 0000000..42cc06a
--- /dev/null
+++ b/LayoutTests/platform/mac/security/block-test-no-port-expected.txt
@@ -0,0 +1,6 @@
+http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test-no-port.html> redirectResponse (null)
+<unknown> - didFinishLoading
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
+This test attempts to change the src of an IMG tag to a blocked IP with no port to confirm that WebKit returns the correct error for it - blocked instead of cannot find. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree. In addition, on some systems the results may depend on the behavior of the proxy.
+
+

diff --git a/LayoutTests/security/block-test-no-port.html b/LayoutTests/security/block-test-no-port.html
new file mode 100644 (file)
index 0000000..c11e54c
--- /dev/null
+++ b/LayoutTests/security/block-test-no-port.html
@@ -0,0 +1,23 @@
+<html>
+<script>
+    var baseURL = "255.255.255.255";
+    var currentPort = 0;
+
+    if (window.layoutTestController) {
+        layoutTestController.waitUntilDone();
+        layoutTestController.dumpResourceLoadCallbacks();
+    }
+
+    function finishTesting() {
+        if (window.layoutTestController) {
+            layoutTestController.dumpAsText();
+            setTimeout("layoutTestController.notifyDone()", 0);
+        }
+    }
+</script>
+<body>
+<p>This test attempts to change the src of an IMG tag to a blocked IP with no port to confirm that WebKit returns the correct error for it - blocked instead of cannot find. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree. In addition, on some systems the results may depend on the behavior of the proxy.
+</p>
+<img id="testIMG" src="http://255.255.255.255/test.jpg" onError="finishTesting();"></img>
+</body>
+</html>

diff --git a/LayoutTests/security/block-test.html b/LayoutTests/security/block-test.html
index 74eac33cf512eace1aad821f6b70918f31f5a3e3..edc1483f9dfab1c7463a6f2bdfd566843b52bb78 100644 (file)
--- a/LayoutTests/security/block-test.html
+++ b/LayoutTests/security/block-test.html
@@ -1,6 +1,7 @@
 <html>
 <script>
-    var blockedPorts = new Array(1, 7, 9, 11, 13, 15, 17, 19, 20, 
+    // Note that port "1" is tested by the initial load.
+    var blockedPorts = new Array(7, 9, 11, 13, 15, 17, 19, 20, 
       21, 22, 23, 25, 37, 42, 43, 53, 77, 79, 87, 95, 101, 102, 
       103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 139,
       143, 179, 389, 465, 512, 513, 514, 515, 526, 530, 531, 532,
@@ -54,6 +55,6 @@
 correct error for them - blocked instead of cannot find.  It also tries the FTP ports for exemptions.  Due to the 
 nature of this test, the results can only be processed automatically via DumpRenderTree
 </p>
-<img id="testIMG" src="http://255.255.255.255/test.jpg" onError="nextTest();"></img>
+<img id="testIMG" src="http://255.255.255.255:1/test.jpg" onError="nextTest();"></img>
 </body>
 </html>