Diff
Modified: trunk/LayoutTests/ChangeLog (90098 => 90099)
--- trunk/LayoutTests/ChangeLog 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/ChangeLog 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,3 +1,31 @@
+2011-06-30 Yuta Kitamura <[email protected]>
+
+ Reviewed by Kent Tamura.
+
+ WebSocket: Fix style issues of pywebsocket handlers
+ https://bugs.webkit.org/show_bug.cgi?id=63689
+
+ Fix minor style errors such as wrong indentation or wrong number of blank lines.
+
+ * http/tests/websocket/tests/bad-handshake-crash_wsh.py:
+ * http/tests/websocket/tests/close-on-unload_wsh.py:
+ * http/tests/websocket/tests/echo-challenge_wsh.py:
+ * http/tests/websocket/tests/echo-cookie_wsh.py:
+ * http/tests/websocket/tests/frame-length-longer-than-buffer_wsh.py:
+ * http/tests/websocket/tests/frame-length-overflow_wsh.py:
+ * http/tests/websocket/tests/frame-length-skip_wsh.py:
+ * http/tests/websocket/tests/handshake-fail-by-maxlength_wsh.py:
+ Use sequence repetition pattern instead of a loop.
+ * http/tests/websocket/tests/handshake-fail-by-no-connection-header_wsh.py:
+ * http/tests/websocket/tests/handshake-fail-by-no-cr_wsh.py:
+ * http/tests/websocket/tests/handshake-fail-by-no-upgrade-header_wsh.py:
+ * http/tests/websocket/tests/handshake-fail-by-prepended-null_wsh.py:
+ * http/tests/websocket/tests/hanging-handshake_wsh.py:
+ * http/tests/websocket/tests/long-invalid-header_wsh.py:
+ * http/tests/websocket/tests/send2_wsh.py:
+ * http/tests/websocket/tests/unknown-frame-type_wsh.py:
+ * http/tests/websocket/tests/workers/resources/echo-challenge_wsh.py:
+
2011-06-30 Kent Tamura <[email protected]>
[Mac-wk2] Update expectation files for r90089.
Modified: trunk/LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,11 +1,12 @@
def web_socket_do_extra_handshake(request):
- msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
- msg += "Upgrade: WebSocket\r\n"
- msg += "Connection: Upgrade\r\n"
- msg += "\xa5:\r\n"
- msg += "\r\n"
- request.connection.write(msg)
- print msg
+ msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
+ msg += "Upgrade: WebSocket\r\n"
+ msg += "Connection: Upgrade\r\n"
+ msg += "\xa5:\r\n"
+ msg += "\r\n"
+ request.connection.write(msg)
+ print msg
+
def web_socket_transfer_data(request):
- pass
+ pass
Modified: trunk/LayoutTests/http/tests/websocket/tests/close-on-unload_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/close-on-unload_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/close-on-unload_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -30,9 +30,11 @@
from mod_pywebsocket import msgutil
+
# we don't use set() here, because python on mac tiger doesn't support it.
connections = {}
+
def web_socket_do_extra_handshake(request):
pass # Always accept.
@@ -52,4 +54,3 @@
del connections[request]
for ws in connections.keys():
msgutil.send_message(ws, socketName)
-
Modified: trunk/LayoutTests/http/tests/websocket/tests/echo-challenge_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/echo-challenge_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/echo-challenge_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,10 +1,13 @@
from mod_pywebsocket import msgutil
+
def web_socket_do_extra_handshake(request):
pass
+
def web_socket_transfer_data(request):
msgutil.send_message(request, _hexify(request.ws_challenge))
+
def _hexify(bytes):
return ':'.join(['%02X' % ord(byte) for byte in bytes])
Modified: trunk/LayoutTests/http/tests/websocket/tests/echo-cookie_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/echo-cookie_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/echo-cookie_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -29,8 +29,10 @@
from mod_pywebsocket import msgutil
+
def web_socket_do_extra_handshake(request):
pass
+
def web_socket_transfer_data(request):
msgutil.send_message(request, request.headers_in['Cookie'])
Modified: trunk/LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,6 +1,7 @@
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.
Modified: trunk/LayoutTests/http/tests/websocket/tests/frame-length-overflow_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/frame-length-overflow_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/frame-length-overflow_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,6 +1,7 @@
def web_socket_do_extra_handshake(request):
- pass
+ pass
+
def web_socket_transfer_data(request):
- msg = 16 * '\xff'
- request.connection.write(msg)
+ msg = 16 * '\xff'
+ request.connection.write(msg)
Modified: trunk/LayoutTests/http/tests/websocket/tests/frame-length-skip_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/frame-length-skip_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/frame-length-skip_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,11 +1,12 @@
def web_socket_do_extra_handshake(request):
- pass
+ 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
+ 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
Modified: trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -21,12 +21,11 @@
import time
+
def web_socket_do_extra_handshake(request):
# This will cause the handshake to fail because it pushes the length of the
# status line past 1024 characters
- msg = ""
- for i in range(0, 1024):
- msg += "."
+ msg = '.' * 1024
msg += 'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
msg += 'Upgrade: WebSocket\r\n'
msg += 'Connection: Upgrade\r\n'
@@ -40,5 +39,6 @@
time.sleep(1)
request.connection.write('keepalive\n')
+
def web_socket_transfer_data(request):
pass
Modified: trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -9,5 +9,6 @@
request.connection.write(msg)
print msg
+
def web_socket_transfer_data(request):
pass
Modified: trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -9,5 +9,6 @@
request.connection.write(msg)
print msg
+
def web_socket_transfer_data(request):
pass
Modified: trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -9,5 +9,6 @@
request.connection.write(msg)
print msg
+
def web_socket_transfer_data(request):
pass
Modified: trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -21,6 +21,7 @@
import time
+
def web_socket_do_extra_handshake(request):
# This simulates a broken server that sends a WebSocket frame before the
# handshake, and more frames afterwards. It is important that if this
@@ -45,5 +46,6 @@
for i in range(0, numFrames):
request.connection.write(frame)
+
def web_socket_transfer_data(request):
pass
Modified: trunk/LayoutTests/http/tests/websocket/tests/hanging-handshake_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/hanging-handshake_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/hanging-handshake_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,6 +1,6 @@
def web_socket_do_extra_handshake(request):
request.connection.read()
+
def web_socket_transfer_data(request):
pass
-
Modified: trunk/LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,9 +1,10 @@
def web_socket_do_extra_handshake(request):
- msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
- msg += ("p" * 1024) + "\r\n"
- request.connection.write(msg)
+ msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
+ msg += ("p" * 1024) + "\r\n"
+ request.connection.write(msg)
+
def web_socket_transfer_data(request):
- msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
- msg += ("p" * 1024) + "\r\n"
- request.connection.write(msg)
+ msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
+ msg += ("p" * 1024) + "\r\n"
+ request.connection.write(msg)
Modified: trunk/LayoutTests/http/tests/websocket/tests/send2_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/send2_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/send2_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,6 +1,7 @@
def web_socket_do_extra_handshake(request):
pass # Always accept.
+
def web_socket_transfer_data(request):
# send 2 messages in one packet.
request.connection.write("\x00" + "first message" + "\xff" +
Modified: trunk/LayoutTests/http/tests/websocket/tests/unknown-frame-type_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/unknown-frame-type_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/unknown-frame-type_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,8 +1,10 @@
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')
Modified: trunk/LayoutTests/http/tests/websocket/tests/workers/resources/echo-challenge_wsh.py (90098 => 90099)
--- trunk/LayoutTests/http/tests/websocket/tests/workers/resources/echo-challenge_wsh.py 2011-06-30 09:14:17 UTC (rev 90098)
+++ trunk/LayoutTests/http/tests/websocket/tests/workers/resources/echo-challenge_wsh.py 2011-06-30 09:22:49 UTC (rev 90099)
@@ -1,10 +1,13 @@
from mod_pywebsocket import msgutil
+
def web_socket_do_extra_handshake(request):
pass
+
def web_socket_transfer_data(request):
msgutil.send_message(request, _hexify(request.ws_challenge))
+
def _hexify(bytes):
return ':'.join(['%02X' % ord(byte) for byte in bytes])
