Diff
Modified: trunk/LayoutTests/ChangeLog (94063 => 94064)
--- trunk/LayoutTests/ChangeLog 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/ChangeLog 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,3 +1,32 @@
+2011-08-30 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r94055 and r94057.
+ http://trac.webkit.org/changeset/94055
+ http://trac.webkit.org/changeset/94057
+ https://bugs.webkit.org/show_bug.cgi?id=67191
+
+ Many failures on Mac 10.5 (Requested by toyoshim on #webkit).
+
+ * http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py:
+ * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py:
+ * http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py:
+ * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py:
+ * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py:
+ * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py:
+ * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py:
+ * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py:
+ * http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py:
+ * http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py:
+ * http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py:
+ * http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py:
+ * http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header_wsh.py:
+ * http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py:
+ * http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py:
+ * http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py:
+ * http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header_wsh.py:
+ * http/tests/websocket/tests/hybi/long-invalid-header_wsh.py:
+ * http/tests/websocket/tests/hybi/masked-frames_wsh.py:
+
2011-08-30 Renata Hodovan <[email protected]>
[Qt] Qt Linux Release bot has four failed tests.
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
msg += "Upgrade: WebSocket\r\n"
@@ -12,7 +9,7 @@
msg += request.ws_challenge_md5
request.connection.write(msg)
print msg
- raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
+ raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
pass
@@ -11,4 +8,4 @@
msg += "\x01\xff"
msg += "\0should be skipped\xff"
request.connection.write(msg)
- raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from starting closing handshake.
+ raise Exception("Abort the connection") # Prevents pywebsocket from starting closing handshake.
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
pass
@@ -8,4 +5,4 @@
def web_socket_transfer_data(request):
msg = 16 * '\xff'
request.connection.write(msg)
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from starting closing handshake.
+ raise Exception('Abort the connection') # Prevents pywebsocket from starting closing handshake.
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -20,9 +20,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-from mod_pywebsocket import handshake
-
-
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
@@ -35,7 +32,7 @@
msg += '\r\n'
msg += request.ws_challenge_md5
request.connection.write(msg)
- raise handshake.AbortedByUserException('abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
msg += 'Upgrade: WebSocket\r\n'
@@ -11,7 +8,7 @@
msg += request.ws_challenge_md5
request.connection.write(msg)
print msg
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\n' # Does not end with "\r\n".
msg += 'Upgrade: WebSocket\r\n'
@@ -11,7 +8,7 @@
msg += request.ws_challenge_md5
request.connection.write(msg)
print msg
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
# Missing 'Upgrade: WebSocket\r\n'
@@ -11,7 +8,7 @@
msg += request.ws_challenge_md5
request.connection.write(msg)
print msg
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -20,7 +20,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import time
-from mod_pywebsocket import handshake
def web_socket_do_extra_handshake(request):
@@ -45,10 +44,7 @@
time.sleep(1)
numFrames = 1024 / len(frame) # write over 1024 bytes including the above handshake
for i in range(0, numFrames):
- try:
- request.connection.write(frame)
- except Exception, e:
- raise handshake.AbortedByUserException(e)
+ request.connection.write(frame)
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,13 +1,10 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
msg += ("p" * 1024) + "\r\n"
msg += "\r\n"
msg += request.ws_challenge_md5
request.connection.write(msg)
- raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
+ raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
from mod_pywebsocket.handshake.hybi import compute_accept
@@ -11,7 +10,7 @@
msg += "\r\n"
request.connection.write(msg)
print msg
- raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
+ raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
from mod_pywebsocket.handshake.hybi import compute_accept
@@ -10,7 +9,7 @@
message += 'Sec-WebSocket-Extensions: x-foo\r\n'
message += '\r\n'
request.connection.write(message)
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -20,7 +20,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-from mod_pywebsocket import handshake
from mod_pywebsocket.handshake.hybi import compute_accept
@@ -34,7 +33,7 @@
msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(request.headers_in['Sec-WebSocket-Key'])[0]
msg += '\r\n'
request.connection.write(msg)
- raise handshake.AbortedByUserException('abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,13 +1,10 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
message = 'HTTP/1.1 101 Switching Protocols\r\n'
message += 'Upgrade: websocket\r\n'
message += 'Connection: Upgrade\r\n'
message += '\r\n'
request.connection.write(message)
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
from mod_pywebsocket.handshake.hybi import compute_accept
@@ -10,7 +9,7 @@
msg += '\r\n'
request.connection.write(msg)
print msg
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
from mod_pywebsocket.handshake.hybi import compute_accept
@@ -10,7 +9,7 @@
msg += '\r\n'
request.connection.write(msg)
print msg
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
from mod_pywebsocket.handshake.hybi import compute_accept
@@ -10,7 +9,7 @@
msg += '\r\n'
request.connection.write(msg)
print msg
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
message = 'HTTP/1.1 101 Switching Protocols\r\n'
message += 'Upgrade: websocket\r\n'
@@ -8,7 +5,7 @@
message += 'Sec-WebSocket-Accept: XXXXthisiswrongXXXX\r\n'
message += '\r\n'
request.connection.write(message)
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+ raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/long-invalid-header_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/long-invalid-header_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/long-invalid-header_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,12 +1,9 @@
-from mod_pywebsocket import handshake
-
-
def web_socket_do_extra_handshake(request):
msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
msg += ("p" * 1024) + "\r\n"
msg += "\r\n"
request.connection.write(msg)
- raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
+ raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
def web_socket_transfer_data(request):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/masked-frames_wsh.py (94063 => 94064)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/masked-frames_wsh.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/masked-frames_wsh.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,5 +1,4 @@
from mod_pywebsocket import common
-from mod_pywebsocket import handshake
from mod_pywebsocket import stream
from mod_pywebsocket import msgutil
@@ -32,4 +31,4 @@
# the WebSocket object should be closed cleanly.
request.connection.write(stream.create_close_frame('', mask=True))
- raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from starting its own closing handshake.
+ raise Exception('Abort the connection') # Prevents pywebsocket from starting its own closing handshake.
Modified: trunk/Tools/ChangeLog (94063 => 94064)
--- trunk/Tools/ChangeLog 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/Tools/ChangeLog 2011-08-30 10:05:31 UTC (rev 94064)
@@ -1,3 +1,14 @@
+2011-08-30 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r94055 and r94057.
+ http://trac.webkit.org/changeset/94055
+ http://trac.webkit.org/changeset/94057
+ https://bugs.webkit.org/show_bug.cgi?id=67191
+
+ Many failures on Mac 10.5 (Requested by toyoshim on #webkit).
+
+ * Scripts/webkitpy/thirdparty/__init__.py:
+
2011-08-30 Adam Barth <[email protected]>
Chromium Android should not be a core builder
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (94063 => 94064)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2011-08-30 09:39:00 UTC (rev 94063)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2011-08-30 10:05:31 UTC (rev 94064)
@@ -139,8 +139,8 @@
def _install_pywebsocket(self):
pywebsocket_dir = self._fs.join(_AUTOINSTALLED_DIR, "pywebsocket")
installer = AutoInstaller(target_dir=pywebsocket_dir)
- installer.install(url=""
- url_subpath="pywebsocket-0.6b4/src/mod_pywebsocket")
+ installer.install(url=""
+ url_subpath="pywebsocket-0.6b2/src/mod_pywebsocket")
def _install(self, url, url_subpath):
installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)
