summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpatrick@chromium.org <patrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 22:39:51 +0000
committerpatrick@chromium.org <patrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 22:39:51 +0000
commitc48b39ccc260e30b46681d6925b5f1cc72fd6313 (patch)
treea8cfc8ab5b8d26c06bccf58f6aa71f10e6292225 /webkit
parent3b3952cf5e31adeac5d31de1614fcc2222472c9b (diff)
downloadchromium_src-c48b39ccc260e30b46681d6925b5f1cc72fd6313.zip
chromium_src-c48b39ccc260e30b46681d6925b5f1cc72fd6313.tar.gz
chromium_src-c48b39ccc260e30b46681d6925b5f1cc72fd6313.tar.bz2
Re-baseline LayoutTests\security\block-test-expected.txt.
This test differs in type names, error codes, and GURL canonicalization. Allow the test to fail on Linux and Mac because it requires an FTP implementation. Review URL: http://codereview.chromium.org/46025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/README5
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt128
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt5
3 files changed, 134 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/README b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/README
new file mode 100644
index 0000000..20f99d1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/README
@@ -0,0 +1,5 @@
+This file documents why the various tests have been rebaselined.
+
+block-test.html
+--------------------------
+This test differs in type names, error codes, and GURL canonicalization.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt
new file mode 100644
index 0000000..b686930
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt
@@ -0,0 +1,128 @@
+http://255.255.255.255/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255/test.jpg">
+<unknown> - didFinishLoading
+http://255.255.255.255:1/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:1/test.jpg">
+http://255.255.255.255/test.jpg - didFailLoadingWithError <WebError code -108, failing URL "http://255.255.255.255/test.jpg">
+http://255.255.255.255:1/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:1/test.jpg">
+http://255.255.255.255:7/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:7/test.jpg">
+http://255.255.255.255:7/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:7/test.jpg">
+http://255.255.255.255:9/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:9/test.jpg">
+http://255.255.255.255:9/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:9/test.jpg">
+http://255.255.255.255:11/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:11/test.jpg">
+http://255.255.255.255:11/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:11/test.jpg">
+http://255.255.255.255:13/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:13/test.jpg">
+http://255.255.255.255:13/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:13/test.jpg">
+http://255.255.255.255:15/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:15/test.jpg">
+http://255.255.255.255:15/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:15/test.jpg">
+http://255.255.255.255:17/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:17/test.jpg">
+http://255.255.255.255:17/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:17/test.jpg">
+http://255.255.255.255:19/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:19/test.jpg">
+http://255.255.255.255:19/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:19/test.jpg">
+http://255.255.255.255:20/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:20/test.jpg">
+http://255.255.255.255:20/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:20/test.jpg">
+http://255.255.255.255:21/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:21/test.jpg">
+http://255.255.255.255:21/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:21/test.jpg">
+http://255.255.255.255:22/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:22/test.jpg">
+http://255.255.255.255:22/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:22/test.jpg">
+http://255.255.255.255:23/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:23/test.jpg">
+http://255.255.255.255:23/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:23/test.jpg">
+http://255.255.255.255:25/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:25/test.jpg">
+http://255.255.255.255:25/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:25/test.jpg">
+http://255.255.255.255:37/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:37/test.jpg">
+http://255.255.255.255:37/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:37/test.jpg">
+http://255.255.255.255:42/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:42/test.jpg">
+http://255.255.255.255:42/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:42/test.jpg">
+http://255.255.255.255:43/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:43/test.jpg">
+http://255.255.255.255:43/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:43/test.jpg">
+http://255.255.255.255:53/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:53/test.jpg">
+http://255.255.255.255:53/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:53/test.jpg">
+http://255.255.255.255:77/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:77/test.jpg">
+http://255.255.255.255:77/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:77/test.jpg">
+http://255.255.255.255:79/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:79/test.jpg">
+http://255.255.255.255:79/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:79/test.jpg">
+http://255.255.255.255:87/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:87/test.jpg">
+http://255.255.255.255:87/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:87/test.jpg">
+http://255.255.255.255:95/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:95/test.jpg">
+http://255.255.255.255:95/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:95/test.jpg">
+http://255.255.255.255:101/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:101/test.jpg">
+http://255.255.255.255:101/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:101/test.jpg">
+http://255.255.255.255:102/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:102/test.jpg">
+http://255.255.255.255:102/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:102/test.jpg">
+http://255.255.255.255:103/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:103/test.jpg">
+http://255.255.255.255:103/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:103/test.jpg">
+http://255.255.255.255:104/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:104/test.jpg">
+http://255.255.255.255:104/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:104/test.jpg">
+http://255.255.255.255:109/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:109/test.jpg">
+http://255.255.255.255:109/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:109/test.jpg">
+http://255.255.255.255:110/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:110/test.jpg">
+http://255.255.255.255:110/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:110/test.jpg">
+http://255.255.255.255:111/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:111/test.jpg">
+http://255.255.255.255:111/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:111/test.jpg">
+http://255.255.255.255:113/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:113/test.jpg">
+http://255.255.255.255:113/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:113/test.jpg">
+http://255.255.255.255:115/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:115/test.jpg">
+http://255.255.255.255:115/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:115/test.jpg">
+http://255.255.255.255:117/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:117/test.jpg">
+http://255.255.255.255:117/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:117/test.jpg">
+http://255.255.255.255:119/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:119/test.jpg">
+http://255.255.255.255:119/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:119/test.jpg">
+http://255.255.255.255:123/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:123/test.jpg">
+http://255.255.255.255:123/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:123/test.jpg">
+http://255.255.255.255:135/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:135/test.jpg">
+http://255.255.255.255:135/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:135/test.jpg">
+http://255.255.255.255:139/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:139/test.jpg">
+http://255.255.255.255:139/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:139/test.jpg">
+http://255.255.255.255:143/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:143/test.jpg">
+http://255.255.255.255:143/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:143/test.jpg">
+http://255.255.255.255:179/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:179/test.jpg">
+http://255.255.255.255:179/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:179/test.jpg">
+http://255.255.255.255:389/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:389/test.jpg">
+http://255.255.255.255:389/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:389/test.jpg">
+http://255.255.255.255:465/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:465/test.jpg">
+http://255.255.255.255:465/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:465/test.jpg">
+http://255.255.255.255:512/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:512/test.jpg">
+http://255.255.255.255:512/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:512/test.jpg">
+http://255.255.255.255:513/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:513/test.jpg">
+http://255.255.255.255:513/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:513/test.jpg">
+http://255.255.255.255:514/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:514/test.jpg">
+http://255.255.255.255:514/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:514/test.jpg">
+http://255.255.255.255:515/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:515/test.jpg">
+http://255.255.255.255:515/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:515/test.jpg">
+http://255.255.255.255:526/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:526/test.jpg">
+http://255.255.255.255:526/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:526/test.jpg">
+http://255.255.255.255:530/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:530/test.jpg">
+http://255.255.255.255:530/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:530/test.jpg">
+http://255.255.255.255:531/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:531/test.jpg">
+http://255.255.255.255:531/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:531/test.jpg">
+http://255.255.255.255:532/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:532/test.jpg">
+http://255.255.255.255:532/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:532/test.jpg">
+http://255.255.255.255:540/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:540/test.jpg">
+http://255.255.255.255:540/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:540/test.jpg">
+http://255.255.255.255:556/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:556/test.jpg">
+http://255.255.255.255:556/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:556/test.jpg">
+http://255.255.255.255:563/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:563/test.jpg">
+http://255.255.255.255:563/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:563/test.jpg">
+http://255.255.255.255:587/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:587/test.jpg">
+http://255.255.255.255:587/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:587/test.jpg">
+http://255.255.255.255:601/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:601/test.jpg">
+http://255.255.255.255:601/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:601/test.jpg">
+http://255.255.255.255:636/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:636/test.jpg">
+http://255.255.255.255:636/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:636/test.jpg">
+http://255.255.255.255:993/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:993/test.jpg">
+http://255.255.255.255:993/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:993/test.jpg">
+http://255.255.255.255:995/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:995/test.jpg">
+http://255.255.255.255:995/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:995/test.jpg">
+http://255.255.255.255:2049/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:2049/test.jpg">
+http://255.255.255.255:2049/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:2049/test.jpg">
+http://255.255.255.255:4045/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:4045/test.jpg">
+http://255.255.255.255:4045/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:4045/test.jpg">
+http://255.255.255.255:6000/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:6000/test.jpg">
+http://255.255.255.255:6000/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:6000/test.jpg">
+ftp://255.255.255.255/test.jpg - willSendRequest <WebRequest URL "ftp://255.255.255.255/test.jpg">
+ftp://255.255.255.255/test.jpg - didFailLoadingWithError <WebError code -104, failing URL "ftp://255.255.255.255/test.jpg">
+ftp://255.255.255.255/test.jpg - willSendRequest <WebRequest URL "ftp://255.255.255.255/test.jpg">
+ftp://255.255.255.255/test.jpg - didFailLoadingWithError <WebError code -104, failing URL "ftp://255.255.255.255/test.jpg">
+ftp://255.255.255.255:22/test.jpg - willSendRequest <WebRequest URL "ftp://255.255.255.255:22/test.jpg">
+ftp://255.255.255.255:22/test.jpg - didFailLoadingWithError <WebError code -104, failing URL "ftp://255.255.255.255:22/test.jpg">
+This test attempts to change the src of an IMG tag to all black listed ports to confirm that WebKit returns the 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
+
+
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 4032579..6c284f3 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -949,10 +949,6 @@ MAC : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html
// Fails upstream, deferring for now.
DEFER : LayoutTests/fast/dom/cssTarget-crash.html = TIMEOUT
-// Started failing with r5743 (darin)
-// http://crbug.com/4617
-LayoutTests/security/block-test.html = FAIL
-
// MERGE 38500:39550: New tests
// Missing expected results
SKIP LINUX MAC : LayoutTests/animations/animation-drt-api.html = PASS
@@ -1713,6 +1709,7 @@ LINUX : LayoutTests/fast/canvas/set-colors.html = PASS CRASH
// Needs an FTP implementation to work completely.
LINUX MAC : pending/security/block-test.html = FAIL
+LINUX MAC : LayoutTests/security/block-test.html = FAIL
// Flakey. Not clear when it started, but it was before 3/9/09.
LINUX : LayoutTests/fast/clip/outline-overflowClip.html = CRASH PASS