Title: [87719] trunk/LayoutTests
Revision
87719
Author
[email protected]
Date
2011-05-31 03:20:05 -0700 (Tue, 31 May 2011)

Log Message

2011-05-31  Yuta Kitamura  <[email protected]>

        Reviewed by Kent Tamura.

        WebSocket: Make the output of client-close.html more verbose
        https://bugs.webkit.org/show_bug.cgi?id=61770

        * http/tests/websocket/tests/client-close-expected.txt:
        * http/tests/websocket/tests/client-close.html:
        * http/tests/websocket/tests/client-close_wsh.py:
        Echo back the first two bytes received from the client.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (87718 => 87719)


--- trunk/LayoutTests/ChangeLog	2011-05-31 09:58:31 UTC (rev 87718)
+++ trunk/LayoutTests/ChangeLog	2011-05-31 10:20:05 UTC (rev 87719)
@@ -1,3 +1,15 @@
+2011-05-31  Yuta Kitamura  <[email protected]>
+
+        Reviewed by Kent Tamura.
+
+        WebSocket: Make the output of client-close.html more verbose
+        https://bugs.webkit.org/show_bug.cgi?id=61770
+
+        * http/tests/websocket/tests/client-close-expected.txt:
+        * http/tests/websocket/tests/client-close.html:
+        * http/tests/websocket/tests/client-close_wsh.py:
+        Echo back the first two bytes received from the client.
+
 2011-05-31  Zoltan Horvath  <[email protected]>
 
         [Qt][WK2] Ossyize editing/pasteboard/copy-standalone-image-crash.html since eventSender is not implemented.

Modified: trunk/LayoutTests/http/tests/websocket/tests/client-close-expected.txt (87718 => 87719)


--- trunk/LayoutTests/http/tests/websocket/tests/client-close-expected.txt	2011-05-31 09:58:31 UTC (rev 87718)
+++ trunk/LayoutTests/http/tests/websocket/tests/client-close-expected.txt	2011-05-31 10:20:05 UTC (rev 87719)
@@ -3,7 +3,9 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 Connected
+Received: close_frame='\xff\x00'
 Closed
+PASS receivedMessage is "close_frame='\\xff\\x00'"
 PASS closeEvent.wasClean is true
 PASS successfullyParsed is true
 

Modified: trunk/LayoutTests/http/tests/websocket/tests/client-close.html (87718 => 87719)


--- trunk/LayoutTests/http/tests/websocket/tests/client-close.html	2011-05-31 09:58:31 UTC (rev 87718)
+++ trunk/LayoutTests/http/tests/websocket/tests/client-close.html	2011-05-31 10:20:05 UTC (rev 87719)
@@ -14,6 +14,7 @@
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/client-close");
 var closeEvent;
+var receivedMessage;
 
 ws._onopen_ = function()
 {
@@ -24,12 +25,14 @@
 ws._onmessage_ = function(messageEvent)
 {
     debug("Received: " + messageEvent.data);
+    receivedMessage = messageEvent.data;
 };
 
 ws._onclose_ = function(event)
 {
     debug("Closed");
     closeEvent = event;
+    shouldBeEqualToString("receivedMessage", "close_frame='\\xff\\x00'");
     shouldBeTrue("closeEvent.wasClean");
     finishJSTest();
 };

Modified: trunk/LayoutTests/http/tests/websocket/tests/client-close_wsh.py (87718 => 87719)


--- trunk/LayoutTests/http/tests/websocket/tests/client-close_wsh.py	2011-05-31 09:58:31 UTC (rev 87718)
+++ trunk/LayoutTests/http/tests/websocket/tests/client-close_wsh.py	2011-05-31 10:20:05 UTC (rev 87719)
@@ -9,6 +9,9 @@
     # Wait for a close frame sent from the client.
     close_frame = request.ws_stream.receive_bytes(2)
 
+    # Tell the client what we have received.
+    msgutil.send_message(request, 'close_frame=%r' % close_frame)
+
     # If the following assertion fails, AssertionError will be raised,
     # which will prevent pywebsocket from sending a close frame.
     # In this case, the client will fail to finish closing handshake, thus
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to