[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d

[ap at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 0fb010558d54448b6ef825cc28cb8cd48ae9c769
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 20:16:46 2009 +0000

            Reviewed by David Levin.
    
            https://bugs.webkit.org/show_bug.cgi?id=31426
            Some WebSocket tests don't properly listen to close event
    
            * websocket/tests/script-tests/handshake-error.js:
            * websocket/tests/script-tests/simple.js:
            Made the tests clear second-chance timer on finish, avoiding confusing output when running
            them in Safari.
    
            * websocket/tests/script-tests/frame-length-longer-than-buffer.js:
            * websocket/tests/script-tests/frame-length-skip.js:
            * websocket/tests/frame-length-longer-than-buffer-expected.txt:
            * websocket/tests/frame-length-skip-expected.txt:
            These tests now finish properly.
    
            * websocket/tests/handshake-error-expected.txt:
            * websocket/tests/simple-expected.txt:
            I'm getting an extra empty line for these tests, which is surprising. But since I didn't
            change anything, I assume that it should be there.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 06986b7..0116919 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2009-11-12  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by David Levin.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31426
+        Some WebSocket tests don't properly listen to close event
+
+        * websocket/tests/script-tests/handshake-error.js:
+        * websocket/tests/script-tests/simple.js:
+        Made the tests clear second-chance timer on finish, avoiding confusing output when running
+        them in Safari.
+
+        * websocket/tests/script-tests/frame-length-longer-than-buffer.js:
+        * websocket/tests/script-tests/frame-length-skip.js:
+        * websocket/tests/frame-length-longer-than-buffer-expected.txt:
+        * websocket/tests/frame-length-skip-expected.txt:
+        These tests now finish properly.
+
+        * websocket/tests/handshake-error-expected.txt:
+        * websocket/tests/simple-expected.txt:
+        I'm getting an extra empty line for these tests, which is surprising. But since I didn't
+        change anything, I assume that it should be there.
+
 2009-11-12  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/LayoutTests/websocket/tests/frame-length-longer-than-buffer-expected.txt b/LayoutTests/websocket/tests/frame-length-longer-than-buffer-expected.txt
index d9c7e6e..af37700 100644
--- a/LayoutTests/websocket/tests/frame-length-longer-than-buffer-expected.txt
+++ b/LayoutTests/websocket/tests/frame-length-longer-than-buffer-expected.txt
@@ -4,6 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 WebSocket is open
 received:hello
+WebSocket is closed
 1
 PASS areArraysEqual(received_messages, expected_messages) is true
 PASS successfullyParsed is true
diff --git a/LayoutTests/websocket/tests/frame-length-skip-expected.txt b/LayoutTests/websocket/tests/frame-length-skip-expected.txt
index 6ce6d0d..aa32fe4 100644
--- a/LayoutTests/websocket/tests/frame-length-skip-expected.txt
+++ b/LayoutTests/websocket/tests/frame-length-skip-expected.txt
@@ -5,6 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 WebSocket is open
 received:hello
 received:world
+WebSocket is closed
 2
 PASS areArraysEqual(received_messages, expected_messages) is true
 PASS successfullyParsed is true
diff --git a/LayoutTests/websocket/tests/handshake-error-expected.txt b/LayoutTests/websocket/tests/handshake-error-expected.txt
index def9f22..f704ce9 100644
--- a/LayoutTests/websocket/tests/handshake-error-expected.txt
+++ b/LayoutTests/websocket/tests/handshake-error-expected.txt
@@ -7,3 +7,4 @@ PASS ws.readyState is 2
 PASS successfullyParsed is true
 
 TEST COMPLETE
+
diff --git a/LayoutTests/websocket/tests/script-tests/frame-length-longer-than-buffer.js b/LayoutTests/websocket/tests/script-tests/frame-length-longer-than-buffer.js
index 78d629c..de88c89 100644
--- a/LayoutTests/websocket/tests/script-tests/frame-length-longer-than-buffer.js
+++ b/LayoutTests/websocket/tests/script-tests/frame-length-longer-than-buffer.js
@@ -5,6 +5,7 @@ if (window.layoutTestController)
 var received_messages = [];
 var expected_messages = ["hello"];
 function finish() {
+    clearTimeout(timeoutID);
     debug(received_messages.length);
     for (var i = 0; i < received_messages; i++) {
         debug("received[" + i + "]=" + received_messages[i]);
@@ -25,10 +26,10 @@ ws.onmessage = function (evt) {
     debug("received:" + evt.data);
     received_messages.push(evt.data);
 };
-ws.close = function () {
+ws.onclose = function () {
     debug("WebSocket is closed");
     finish();
 };
-setTimeout("finish()", 2000);
+var timeoutID = setTimeout("finish()", 2000);
 
 var successfullyParsed = true;
diff --git a/LayoutTests/websocket/tests/script-tests/frame-length-skip.js b/LayoutTests/websocket/tests/script-tests/frame-length-skip.js
index 0438796..a682d24 100644
--- a/LayoutTests/websocket/tests/script-tests/frame-length-skip.js
+++ b/LayoutTests/websocket/tests/script-tests/frame-length-skip.js
@@ -5,6 +5,7 @@ if (window.layoutTestController)
 var received_messages = [];
 var expected_messages = ["hello", "world"];
 function finish() {
+    clearTimeout(timeoutID);
     debug(received_messages.length);
     for (var i = 0; i < received_messages; i++) {
         debug("received[" + i + "]=" + received_messages[i]);
@@ -25,10 +26,10 @@ ws.onmessage = function (evt) {
     debug("received:" + evt.data);
     received_messages.push(evt.data);
 };
-ws.close = function () {
+ws.onclose = function () {
     debug("WebSocket is closed");
     finish();
 };
-setTimeout("finish()", 2000);
+var timeoutID = setTimeout("finish()", 2000);
 
 var successfullyParsed = true;
diff --git a/LayoutTests/websocket/tests/script-tests/handshake-error.js b/LayoutTests/websocket/tests/script-tests/handshake-error.js
index 3274104..905ea3d 100644
--- a/LayoutTests/websocket/tests/script-tests/handshake-error.js
+++ b/LayoutTests/websocket/tests/script-tests/handshake-error.js
@@ -7,6 +7,7 @@ if (window.layoutTestController) {
 function endTest()
 {
     isSuccessfullyParsed();
+    clearTimeout(timeoutID);
     if (window.layoutTestController) {
         layoutTestController.notifyDone();
     }
@@ -37,6 +38,6 @@ function timeOutCallback()
     endTest();
 }
 
-window.setTimeout(timeOutCallback, 3000);
+var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
diff --git a/LayoutTests/websocket/tests/script-tests/simple.js b/LayoutTests/websocket/tests/script-tests/simple.js
index cce71fc..b02021e 100644
--- a/LayoutTests/websocket/tests/script-tests/simple.js
+++ b/LayoutTests/websocket/tests/script-tests/simple.js
@@ -7,6 +7,7 @@ if (window.layoutTestController) {
 function endTest()
 {
     isSuccessfullyParsed();
+    clearTimeout(timeoutID);
     if (window.layoutTestController) {
         layoutTestController.notifyDone();
     }
@@ -36,6 +37,6 @@ function timeOutCallback()
     endTest();
 }
 
-window.setTimeout(timeOutCallback, 3000);
+var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
diff --git a/LayoutTests/websocket/tests/simple-expected.txt b/LayoutTests/websocket/tests/simple-expected.txt
index f7142cf..e331a58 100644
--- a/LayoutTests/websocket/tests/simple-expected.txt
+++ b/LayoutTests/websocket/tests/simple-expected.txt
@@ -8,3 +8,4 @@ Closed.
 PASS successfullyParsed is true
 
 TEST COMPLETE
+

-- 
WebKit Debian packaging