[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 970b7fedc08fac4c2de80fdc8a2aec27bc7f05fb
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 00:07:11 2009 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=32132
            websocket/tests/simple.html fails on Windows
    
            * websocket/tests/script-tests/simple.js:
            * websocket/tests/simple-expected.txt:
            Make the test weaker - readyState could already grow by the time a posted event gets dispatched.
    
            * platform/win/Skipped: Un-skip the test.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51667 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f95d0ec..bb2243d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-03  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32132
+        websocket/tests/simple.html fails on Windows
+
+        * websocket/tests/script-tests/simple.js:
+        * websocket/tests/simple-expected.txt:
+        Make the test weaker - readyState could already grow by the time a posted event gets dispatched.
+
+        * platform/win/Skipped: Un-skip the test.
+
 2009-12-03  Julie Parent  <jparent at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 4f8d877..a17061b 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -722,6 +722,3 @@ inspector/timeline-network-resource.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=32038 - Flaky on Windows
 http/tests/cache/subresource-failover-to-network.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=32132
-websocket/tests/simple.html
diff --git a/LayoutTests/websocket/tests/script-tests/simple.js b/LayoutTests/websocket/tests/script-tests/simple.js
index 7e7be03..6964fad 100644
--- a/LayoutTests/websocket/tests/script-tests/simple.js
+++ b/LayoutTests/websocket/tests/script-tests/simple.js
@@ -14,21 +14,21 @@ function endTest()
 }
 
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/simple");
-debug("Created a socket to '" + ws.URL + "'; readyState = " + ws.readyState + ".");
+debug("Created a socket to '" + ws.URL + "'; readyState " + ws.readyState + ".");
 
 ws.onopen = function()
 {
-    debug("Connected; readyState = " + ws.readyState + ".");
+    debug("Connected; readyState " + ((ws.readyState >= 0) ? ">= 0." : ws.readyState));
 };
 
 ws.onmessage = function(messageEvent)
 {
-    debug("Received: '" + messageEvent.data + "'; readyState = " + ws.readyState + ".");
+    debug("Received: '" + messageEvent.data + "'; readyState " + ((ws.readyState >= 1) ? ">= 1." : ws.readyState));
 };
 
 ws.onclose = function()
 {
-    debug("Closed; readyState = " + ws.readyState + ".");
+    debug("Closed; readyState " + ws.readyState + ".");
     endTest();
 };
 
diff --git a/LayoutTests/websocket/tests/simple-expected.txt b/LayoutTests/websocket/tests/simple-expected.txt
index c24021c..169fd60 100644
--- a/LayoutTests/websocket/tests/simple-expected.txt
+++ b/LayoutTests/websocket/tests/simple-expected.txt
@@ -2,10 +2,10 @@ Simple Web Socket test
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-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.
+Created a socket to 'ws://localhost:8880/websocket/tests/simple'; readyState 0.
+Connected; readyState >= 0.
+Received: 'Hello from Simple WSH.'; readyState >= 1.
+Closed; readyState 2.
 PASS successfullyParsed is true
 
 TEST COMPLETE

-- 
WebKit Debian packaging