summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 23:24:44 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 23:24:44 +0000
commit407de99c16b61413193265bf09bb01b87081596b (patch)
tree60ebc2896340a49a468123713549a4b811eae726 /webkit
parent6df853c758ee98981354428c52107545d743fceb (diff)
downloadchromium_src-407de99c16b61413193265bf09bb01b87081596b.zip
chromium_src-407de99c16b61413193265bf09bb01b87081596b.tar.gz
chromium_src-407de99c16b61413193265bf09bb01b87081596b.tar.bz2
Rebaseline tests whose expectations have changed after new googleurl was pulled in.
TBR=brettw TEST=none BUG=33038 Review URL: http://codereview.chromium.org/855004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hostname-expected.txt4
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-port-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/url-parse-1-expected.txt8
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
4 files changed, 8 insertions, 11 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hostname-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hostname-expected.txt
index 6db9153..b3cdd43 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hostname-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hostname-expected.txt
@@ -8,7 +8,7 @@ PASS a.href is 'https://www.otherdomain.com:8080/path/'
Extra slashes before hostname
PASS a.href is 'https://www.otherdomain.com:8080/path/'
Set hostname to URL with foo: protocol
-PASS a.href is 'foo://www.otherdomain.com/path/'
+FAIL a.href should be foo://www.otherdomain.com/path/. Was foo://www.mydomain.com/path/.
Set hostname to null
PASS a.href is 'https://www.mydomain.com:8080/path/'
Set hostname to empty string
@@ -18,7 +18,7 @@ PASS a.href is 'really:bad:url'
Set a hostname that contains space in it
FAIL a.href should be http://www.my domain.com/path/. Was http://www.other%20domain.com/path/.
Set hostname on a local file
-FAIL a.href should be c:/path/testurl.html. Was file:///C:/path/testurl.html.
+PASS a.href is 'c:/path/testurl.html'
Set hostname to undefined
PASS a.href is 'https://undefined:8080/path/'
PASS successfullyParsed is true
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-port-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-port-expected.txt
index 5c03d7b..f84a331 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-port-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-port-expected.txt
@@ -18,7 +18,7 @@ FAIL a.href should be https://www.mydomain.com:0/path/testurl.html?key=value. Wa
Set port to undefined
FAIL a.href should be https://www.mydomain.com:0/path/testurl.html?key=value. Was https://www.mydomain.com/path/testurl.html?key=value.
Set port to URL with foo: protocol
-PASS a.href is 'foo://bar:50/'
+FAIL a.href should be foo://bar:50/. Was foo://bar/.
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/url-parse-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/url-parse-1-expected.txt
index e0b101d..82a674a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/url-parse-1-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/url-parse-1-expected.txt
@@ -32,7 +32,7 @@ x-webkit: x-webkit:
x-webkit:test x-webkit:test test
x-webkit:/ x-webkit:/ /
x-webkit:/test x-webkit:/test /test
-x-webkit:// x-webkit:
-x-webkit://test x-webkit://test/ test /
-x-webkit:/// x-webkit:
-x-webkit:///test x-webkit://test/ test /
+x-webkit:// x-webkit:// //
+x-webkit://test x-webkit://test //test
+x-webkit:/// x-webkit:/// ///
+x-webkit:///test x-webkit:///test ///test
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b82d6f8..d30e334 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2858,10 +2858,7 @@ BUG_JIANLI : http/tests/local/send-sliced-dragged-file.html = FAIL
BUG37684 SKIP : http/tests/cookies/third-party-cookie-relaxing.html = FAIL
// WebKit roll r55683 -> r55709
-BUG37779 : fast/dom/HTMLAnchorElement/set-href-attribute-hostname.html = TEXT
-BUG37779 : fast/dom/HTMLAnchorElement/set-href-attribute-port.html = TEXT
-BUG37779 : fast/loader/url-parse-1.html = TEXT
-BUG37779 : http/tests/loading/state-object-security-exception.html = TEXT
+BUG29393 : http/tests/loading/state-object-security-exception.html = TEXT
// Bugs that went unreported when we upstreamed run_webkit_tests
BUG37896 WIN LINUX : editing/deleting/delete-3857753-fix.html = TEXT