summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-11 19:27:24 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-11 19:27:24 +0000
commit81b0ab1f1bc9c3a60dfba1906f586660c8b48bdb (patch)
tree5e2d02a18421ef1d85d61069e394f29706b6d2dc /webkit
parentc6bd178914f5692f9bc59994d656a3d571c494fb (diff)
downloadchromium_src-81b0ab1f1bc9c3a60dfba1906f586660c8b48bdb.zip
chromium_src-81b0ab1f1bc9c3a60dfba1906f586660c8b48bdb.tar.gz
chromium_src-81b0ab1f1bc9c3a60dfba1906f586660c8b48bdb.tar.bz2
Clean up expectations, rebaseline test due to V8/JSC output differences.
TBR=michaeln TEST=none BUG=29930 Review URL: http://codereview.chromium.org/491051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt19
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt19
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
3 files changed, 41 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt
new file mode 100644
index 0000000..06015ae
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt
@@ -0,0 +1,19 @@
+Test WebSocket bad sub-protocol names.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", " ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "€") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "あ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "￿") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "￾") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "𠀋") threw exception Error: SYNTAX_ERR: DOM Exception 12.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt
new file mode 100644
index 0000000..06015ae
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt
@@ -0,0 +1,19 @@
+Test WebSocket bad sub-protocol names.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", " ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "€") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "あ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "￿") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "￾") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "𠀋") threw exception Error: SYNTAX_ERR: DOM Exception 12.
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 271923b..433e453 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3238,17 +3238,15 @@ BUG29737 WIN : LayoutTests/svg/filters/feTile.svg = TEXT
BUG29737 WIN : LayoutTests/svg/filters/subRegion-one-effect.svg = TEXT
BUG29737 WIN : LayoutTests/svg/filters/subRegion-two-effects.svg = TEXT
-// More Webkit Roll to r51875 - rebaseline needed i think
-BUG_MICHAELN : LayoutTests/websocket/tests/bad-sub-protocol.html = TEXT
// WebKit Roll to r51915
-BUG29928 : LayoutTests/websocket/tests/sub-protocol-with-space.html = TEXT
-BUG29930 : LayoutTests/fast/loader/input-element-page-cache-crash.html = TIMEOUT
+BUG29928 SKIP : LayoutTests/websocket/tests/sub-protocol-with-space.html = TEXT
+BUG29930 SLOW : LayoutTests/fast/loader/input-element-page-cache-crash.html = PASS
// Was first marked as (WIN: TEXT, LINUX: TEXT, MAC: IMAGE+TEXT) by
// roll r51875, and then after http://trac.webkit.org/changeset/51936 the
// shadows broke so IMAGE failure was added to WIN/LINUX.
-BUG30048_and_29737 : LayoutTests/svg/filters/shadow-on-rect-with-filter.svg = IMAGE+TEXT
+BUG30048 BUG29737 : LayoutTests/svg/filters/shadow-on-rect-with-filter.svg = IMAGE+TEXT
// Broke due to changes to shadow compositing, courtesy of:
// http://trac.webkit.org/changeset/51936: