[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bb194311237242135ef75c2e92247abc5e3d3174
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 2 02:17:53 2010 +0000

    2010-10-01  Martin Robinson  <mrobinson at igalia.com>
    
            Removed an expected result for a previously skipped test. This test
            is skipped because it fails on 1 (out of 4) GTK+ bots. It had
            started failing again after the WebSocket tests were relocated and
            the skipped list was no longer up to date.
    
            * platform/gtk/Skipped: Update skipped list to reflect new test location.
            * platform/gtk/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6841606..c5cb877 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-01  Martin Robinson  <mrobinson at igalia.com>
+
+        Removed an expected result for a previously skipped test. This test
+        is skipped because it fails on 1 (out of 4) GTK+ bots. It had
+        started failing again after the WebSocket tests were relocated and
+        the skipped list was no longer up to date.
+
+        * platform/gtk/Skipped: Update skipped list to reflect new test location.
+        * platform/gtk/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt: Removed.
+
 2010-10-01  Tony Chang  <tony at chromium.org>
 
         Unreviewed.  Turns out Safari Win matches Safari Mac so move the
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index df1ae71..cd12da7 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5911,5 +5911,5 @@ fast/text/large-text-composed-char-dos.html
 plugins/plugin-document-load-prevented-userscript.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=46942
-websocket/tests/bad-sub-protocol-control-chars.html
+http/tests/websocket/tests/bad-sub-protocol-control-chars.html
 
diff --git a/LayoutTests/platform/gtk/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/platform/gtk/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
deleted file mode 100644
index b904c8e..0000000
--- a/LayoutTests/platform/gtk/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0000'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0009'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u000A'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u000D'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u001B'
-Test WebSocket bad sub-protocol names by control characters.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "\0") 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 successfullyParsed is true
-
-TEST COMPLETE
-

-- 
WebKit Debian packaging