Diff
Modified: trunk/LayoutTests/ChangeLog (90800 => 90801)
--- trunk/LayoutTests/ChangeLog 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/ChangeLog 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,3 +1,51 @@
+2011-07-11 Yuta Kitamura <yu...@chromium.org>
+
+ WebSocket: Remove WebSocket tests that do not apply to hybi protocol
+ https://bugs.webkit.org/show_bug.cgi?id=64288
+
+ Reviewed by Kent Tamura.
+
+ Remove tests from http/tests/websocket/tests/hybi that are not meaningful in terms of
+ the hybi protocol. The most recent WebSocket protocol draft is available at
+ <http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10>, and referred as
+ "hybi-10" here.
+
+ * http/tests/websocket/tests/hybi/error-detect-expected.txt: Removed.
+ * http/tests/websocket/tests/hybi/error-detect.html: Removed.
+ Hybi protocol has a completely different scheme of representing frame types.
+ Additionally, hybi-10 no longer fires "error" events (which invoke "onerror" handler).
+ * http/tests/websocket/tests/hybi/fixed-origin_wsh.py: Removed.
+ * http/tests/websocket/tests/hybi/frame-length-longer-than-buffer-expected.txt: Removed.
+ * http/tests/websocket/tests/hybi/frame-length-longer-than-buffer.html: Removed.
+ Variable-length encoding (which is used to represent frame length in hixie-76) is no longer
+ used in hybi-10.
+ * http/tests/websocket/tests/hybi/frame-length-longer-than-buffer_wsh.py: Removed.
+ * http/tests/websocket/tests/hybi/frame-length-overflow-expected.txt: Removed.
+ * http/tests/websocket/tests/hybi/frame-length-overflow.html: Removed. Ditto.
+ * http/tests/websocket/tests/hybi/frame-length-overflow_wsh.py: Removed.
+ * http/tests/websocket/tests/hybi/frame-length-skip-expected.txt: Removed.
+ * http/tests/websocket/tests/hybi/frame-length-skip.html: Removed.
+ There are two ways to indicate the length of a frame in hixie-76 protocol, but
+ hybi-10 has only one method (length-prefixed frames). Skipping unwanted frames will
+ be covered by other tests that will be added in a later patch.
+ * http/tests/websocket/tests/hybi/frame-length-skip_wsh.py: Removed.
+ * http/tests/websocket/tests/hybi/handshake-fail-by-cross-origin-expected.txt: Removed.
+ * http/tests/websocket/tests/hybi/handshake-fail-by-cross-origin.html: Removed.
+ In hybi-10, servers no longer returns Origin header in handshake response, and clients
+ are not required to validate this value.
+ * http/tests/websocket/tests/hybi/handshake-fail-by-sub-protocol-mismatch-expected.txt: Removed.
+ * http/tests/websocket/tests/hybi/handshake-fail-by-sub-protocol-mismatch.html: Removed.
+ In hybi-10, clients are not required to (and must not) compare the values of subprotocols
+ in client's request and server's response.
+ * http/tests/websocket/tests/hybi/unknown-frame-type_wsh.py: Removed.
+ * http/tests/websocket/tests/hybi/url-with-query-for-no-query-expected.txt: Removed.
+ * http/tests/websocket/tests/hybi/url-with-query-for-no-query.html: Removed.
+ In hybi-10, servers do not provide "Sec-WebSocket-Location" header, and clients are not required
+ to validate this value.
+ * http/tests/websocket/tests/hybi/websocket-protocol-ignored-expected.txt: Removed.
+ * http/tests/websocket/tests/hybi/websocket-protocol-ignored.html: Removed.
+ Same as handshake-fail-by-sub-protocol-mismatch.html.
+
2011-07-11 Ryosuke Niwa <rn...@webkit.org>
positionForPoint is broken when a block is positioned relatively inside the parent
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/error-detect-expected.txt (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/error-detect-expected.txt 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/error-detect-expected.txt 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,12 +0,0 @@
-Make sure WebSocket correctly fire error event for unknown frame type.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-WebSocket is open
-received:done
-WebSocket is closed
-PASS errorCount is 255
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/error-detect.html (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/error-detect.html 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/error-detect.html 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script type="text/_javascript_">
-description("Make sure WebSocket correctly fire error event for unknown frame type.");
-
-window.jsTestIsAsync = true;
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
-var errorCount = 0;
-
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/unknown-frame-type");
-ws._onopen_ = function () {
- debug("WebSocket is open");
-};
-ws._onmessage_ = function (evt) {
- debug("received:" + evt.data);
-};
-ws._onerror_ = function () {
- errorCount += 1;
-};
-ws._onclose_ = function () {
- debug("WebSocket is closed");
- shouldBe("errorCount", "255");
- finishJSTest();
-};
-
-var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/fixed-origin_wsh.py (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/fixed-origin_wsh.py 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/fixed-origin_wsh.py 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,38 +0,0 @@
-# Copyright (C) 2009 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-from mod_pywebsocket import msgutil
-
-
-def web_socket_do_extra_handshake(request):
- request.ws_origin = 'http://example.com'
-
-
-def web_socket_transfer_data(request):
- msgutil.send_message(request, request.ws_origin)
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer-expected.txt (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer-expected.txt 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer-expected.txt 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,13 +0,0 @@
-Make sure WebSocket correctly skip lengthed frame even if received data has incomplete frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-WebSocket is open
-received:hello
-WebSocket is closed
-1
-PASS areArraysEqual(received_messages, expected_messages) is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer.html (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer.html 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer.html 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script type="text/_javascript_">
-description("Make sure WebSocket correctly skip lengthed frame even if received data has incomplete frame.");
-
-window.jsTestIsAsync = true;
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
-var received_messages = [];
-var expected_messages = ["hello"];
-function finish() {
- clearTimeout(timeoutID);
- debug(received_messages.length);
- for (var i = 0; i < received_messages; i++) {
- debug("received[" + i + "]=" + received_messages[i]);
- }
-
- shouldBeTrue("areArraysEqual(received_messages, expected_messages)");
-
- finishJSTest();
-}
-
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/frame-length-longer-than-buffer");
-ws._onopen_ = function () {
- debug("WebSocket is open");
-};
-ws._onmessage_ = function (evt) {
- debug("received:" + evt.data);
- received_messages.push(evt.data);
-};
-ws._onclose_ = function () {
- debug("WebSocket is closed");
- finish();
-};
-var timeoutID = setTimeout("finish()", 2000);
-
-var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer_wsh.py (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer_wsh.py 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-longer-than-buffer_wsh.py 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,11 +0,0 @@
-def web_socket_do_extra_handshake(request):
- pass
-
-
-def web_socket_transfer_data(request):
- msg = "\0hello\xff"
- msg += "\x80\x81\x01" # Skip 1*128+1 bytes.
- msg += "\x01\xff"
- msg += "\0should be skipped\xff"
- request.connection.write(msg)
- raise Exception("Abort the connection") # Prevents pywebsocket from starting closing handshake.
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow-expected.txt (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow-expected.txt 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow-expected.txt 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,12 +0,0 @@
-CONSOLE MESSAGE: line 0: WebSocket frame length too large
-Make sure WebSocket does not crash and report error when it sees length overflow
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-WebSocket is open
-WebSocket received error frame
-WebSocket is closed
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow.html (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow.html 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow.html 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,35 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script>
-description("Make sure WebSocket does not crash and report error when it sees length overflow");
-
-window.jsTestIsAsync = true;
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/frame-length-overflow");
-ws._onopen_ = function () {
- debug("WebSocket is open");
-};
-ws._onmessage_ = function (evt) {
- debug("WebSocket received:" + evt.data);
-};
-ws._onerror_ = function () {
- debug("WebSocket received error frame");
-};
-ws._onclose_ = function () {
- debug("WebSocket is closed");
- finishJSTest();
-};
-
-var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow_wsh.py (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow_wsh.py 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-overflow_wsh.py 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,8 +0,0 @@
-def web_socket_do_extra_handshake(request):
- pass
-
-
-def web_socket_transfer_data(request):
- msg = 16 * '\xff'
- request.connection.write(msg)
- raise Exception('Abort the connection') # Prevents pywebsocket from starting closing handshake.
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip-expected.txt (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip-expected.txt 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip-expected.txt 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,14 +0,0 @@
-Make sure WebSocket correctly skip lengthed frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-WebSocket is open
-received:hello
-received:world
-WebSocket is closed
-2
-PASS areArraysEqual(received_messages, expected_messages) is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip.html (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip.html 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip.html 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script type="text/_javascript_">
-description("Make sure WebSocket correctly skip lengthed frame.");
-
-window.jsTestIsAsync = true;
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
-var received_messages = [];
-var expected_messages = ["hello", "world"];
-function finish() {
- clearTimeout(timeoutID);
- debug(received_messages.length);
- for (var i = 0; i < received_messages; i++) {
- debug("received[" + i + "]=" + received_messages[i]);
- }
-
- shouldBeTrue("areArraysEqual(received_messages, expected_messages)");
-
- finishJSTest();
-}
-
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/frame-length-skip");
-ws._onopen_ = function () {
- debug("WebSocket is open");
-};
-ws._onmessage_ = function (evt) {
- debug("received:" + evt.data);
- received_messages.push(evt.data);
-};
-ws._onclose_ = function () {
- debug("WebSocket is closed");
- finish();
-};
-var timeoutID = setTimeout("finish()", 2000);
-
-var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip_wsh.py (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip_wsh.py 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/frame-length-skip_wsh.py 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,12 +0,0 @@
-def web_socket_do_extra_handshake(request):
- pass
-
-
-def web_socket_transfer_data(request):
- msg = "\0hello\xff"
- msg += "\x80\x81\x01" # skip 1*128+1 bytes.
- msg += "\x01"
- msg += "\0should be skipped" + (" " * 109) + "\xff"
- msg += "\0world\xff"
- request.connection.write(msg)
- print msg
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-cross-origin-expected.txt (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-cross-origin-expected.txt 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-cross-origin-expected.txt 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,13 +0,0 @@
-CONSOLE MESSAGE: line 0: Error during WebSocket handshake: origin mismatch: http://127.0.0.1:8000 != http://example.com
-Make sure Web Socket connection failed if origin mismatches.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-document.domain=127.0.0.1
-ws.url=""
-PASS connected is false
-PASS origin is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-cross-origin.html (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-cross-origin.html 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-cross-origin.html 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script type="text/_javascript_">
-description("Make sure Web Socket connection failed if origin mismatches.");
-
-window.jsTestIsAsync = true;
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
-var connected = false;
-var origin;
-
-function endTest()
-{
- shouldBeFalse("connected");
- shouldBeUndefined("origin");
- clearTimeout(timeoutID);
- finishJSTest();
-}
-
-var url = ""
-debug("document.domain=" + document.domain);
-debug("ws.url="" + url);
-var ws = new WebSocket(url);
-
-ws._onopen_ = function()
-{
- debug("Connected");
- connected = true;
-};
-
-ws._onmessage_ = function (messageEvent)
-{
- origin = messageEvent.data;
- debug("origin=" + origin);
- ws.close();
-};
-
-ws._onclose_ = function()
-{
- endTest();
-};
-
-function timeOutCallback()
-{
- debug("Timed out in state: " + ws.readyState);
- endTest();
-}
-
-var timeoutID = setTimeout(timeOutCallback, 3000);
-
-var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-sub-protocol-mismatch-expected.txt (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-sub-protocol-mismatch-expected.txt 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-sub-protocol-mismatch-expected.txt 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,10 +0,0 @@
-CONSOLE MESSAGE: line 0: Error during WebSocket handshake: protocol mismatch: requestting-protocol != available-protocol
-Test WebSocket handshake fail if sub protocol name mismatches.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS protocol is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-sub-protocol-mismatch.html (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-sub-protocol-mismatch.html 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-sub-protocol-mismatch.html 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script type="text/_javascript_">
-description("Test WebSocket handshake fail if sub protocol name mismatches.");
-
-window.jsTestIsAsync = true;
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
-var protocol;
-
-function endTest()
-{
- shouldBeUndefined("protocol");
- clearTimeout(timeoutID);
- finishJSTest();
-}
-
-var url = ""
-var ws = new WebSocket(url, "requestting-protocol");
-
-ws._onopen_ = function()
-{
- debug("Connected");
-};
-
-ws._onmessage_ = function (messageEvent)
-{
- protocol = messageEvent.data;
- ws.close();
-};
-
-ws._onclose_ = function()
-{
- endTest();
-};
-
-function timeOutCallback()
-{
- debug("Timed out in state: " + ws.readyState);
- endTest();
-}
-
-var timeoutID = setTimeout(timeOutCallback, 3000);
-
-var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/unknown-frame-type_wsh.py (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/unknown-frame-type_wsh.py 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/unknown-frame-type_wsh.py 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,14 +0,0 @@
-from mod_pywebsocket import msgutil
-
-
-def web_socket_do_extra_handshake(request):
- pass
-
-
-def web_socket_transfer_data(request):
- for i in range(1, 128):
- request.connection.write(chr(i) + str(i) + '\xff')
- for i in range(128, 256):
- msg = str(i)
- request.connection.write(chr(i) + chr(len(msg)) + msg)
- msgutil.send_message(request, 'done')
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/url-with-query-for-no-query-expected.txt (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/url-with-query-for-no-query-expected.txt 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/url-with-query-for-no-query-expected.txt 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,13 +0,0 @@
-CONSOLE MESSAGE: line 0: Error during WebSocket handshake: location mismatch: ws://127.0.0.1:8880/websocket/tests/hybi/no-query? != /websocket/tests/hybi/no-query
-Make sure handshake with URL with query components fails against server that doesn't support query component.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-url=""
-WebSocket is closed
-PASS handshake_success is false
-PASS ws_location is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/url-with-query-for-no-query.html (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/url-with-query-for-no-query.html 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/url-with-query-for-no-query.html 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script type="text/_javascript_">
-description("Make sure handshake with URL with query components fails against server that doesn't support query component.");
-
-window.jsTestIsAsync = true;
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
-var url = ""
-var handshake_success = false;
-var ws_location;
-
-function endTest()
-{
- clearTimeout(timeoutID);
- shouldBeFalse("handshake_success");
- shouldBeUndefined("ws_location");
- finishJSTest();
-}
-
-debug("url="" + url);
-var ws = new WebSocket(url);
-ws._onopen_ = function () {
- debug("WebSocket is open");
- handshake_success = true;
-};
-ws._onmessge_ = function (evt) {
- ws_location = evt.data;
- debug("received:" + ws_location);
- ws.close();
-};
-ws._onclose_ = function () {
- debug("WebSocket is closed");
- endTest();
-};
-var timeoutID = setTimeout("endTest()", 2000);
-
-var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/websocket-protocol-ignored-expected.txt (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/websocket-protocol-ignored-expected.txt 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/websocket-protocol-ignored-expected.txt 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,10 +0,0 @@
-Test WebSocket handshake success without protocol and ignore WebSocket-Protocol from server.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-Connected
-PASS protocol is "sub-protocol"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/websocket/tests/hybi/websocket-protocol-ignored.html (90800 => 90801)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/websocket-protocol-ignored.html 2011-07-12 01:10:32 UTC (rev 90800)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/websocket-protocol-ignored.html 2011-07-12 01:26:12 UTC (rev 90801)
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script type="text/_javascript_">
-description("Test WebSocket handshake success without protocol and ignore WebSocket-Protocol from server.");
-
-window.jsTestIsAsync = true;
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-
-var protocol;
-
-function endTest()
-{
- shouldBe("protocol", '"sub-protocol"');
- clearTimeout(timeoutID);
- finishJSTest();
-}
-
-var url = ""
-var ws = new WebSocket(url);
-
-ws._onopen_ = function()
-{
- debug("Connected");
-};
-
-ws._onmessage_ = function (messageEvent)
-{
- protocol = messageEvent.data;
- ws.close();
-};
-
-ws._onclose_ = function()
-{
- endTest();
-};
-
-function timeOutCallback()
-{
- debug("Timed out in state: " + ws.readyState);
- endTest();
-}
-
-var timeoutID = setTimeout(timeOutCallback, 3000);
-
-var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>
