[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit aab13661cd58c0afaae59ce8fc8964d63e66269d
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 23:25:26 2009 +0000

            Reviewed by Darin Fisher.
    
            https://bugs.webkit.org/show_bug.cgi?id=32089
            Test that WebSocket.readyState is set correctly
    
            * websocket/tests/script-tests/simple.js:
            (ws.onopen):
            (ws.onmessage):
            (ws.onclose):
            * websocket/tests/simple-expected.txt:
            Added readyState logging.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51615 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a0f812e..212917a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-02  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32089
+        Test that WebSocket.readyState is set correctly
+
+        * websocket/tests/script-tests/simple.js:
+        (ws.onopen):
+        (ws.onmessage):
+        (ws.onclose):
+        * websocket/tests/simple-expected.txt:
+        Added readyState logging.
+
 2009-11-30  Julie Parent  <jparent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/websocket/tests/script-tests/simple.js b/LayoutTests/websocket/tests/script-tests/simple.js
index b02021e..7e7be03 100644
--- a/LayoutTests/websocket/tests/script-tests/simple.js
+++ b/LayoutTests/websocket/tests/script-tests/simple.js
@@ -14,20 +14,21 @@ function endTest()
 }
 
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/simple");
+debug("Created a socket to '" + ws.URL + "'; readyState = " + ws.readyState + ".");
 
 ws.onopen = function()
 {
-    debug("Connected.");
+    debug("Connected; readyState = " + ws.readyState + ".");
 };
 
 ws.onmessage = function(messageEvent)
 {
-    debug("Received: '" + messageEvent.data + "'");
+    debug("Received: '" + messageEvent.data + "'; readyState = " + ws.readyState + ".");
 };
 
 ws.onclose = function()
 {
-    debug("Closed.");
+    debug("Closed; readyState = " + ws.readyState + ".");
     endTest();
 };
 
diff --git a/LayoutTests/websocket/tests/simple-expected.txt b/LayoutTests/websocket/tests/simple-expected.txt
index e331a58..c24021c 100644
--- a/LayoutTests/websocket/tests/simple-expected.txt
+++ b/LayoutTests/websocket/tests/simple-expected.txt
@@ -2,9 +2,10 @@ Simple Web Socket test
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-Connected.
-Received: 'Hello from Simple WSH.'
-Closed.
+Created a socket to 'ws://localhost:8880/websocket/tests/simple'; readyState = 0.
+Connected; readyState = 1.
+Received: 'Hello from Simple WSH.'; readyState = 1.
+Closed; readyState = 2.
 PASS successfullyParsed is true
 
 TEST COMPLETE

-- 
WebKit Debian packaging