Changeset 50892 in webkit


Ignore:
Timestamp:
Nov 12, 2009 12:16:46 PM (14 years ago)
Author:
ap@apple.com
Message:

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.
Location:
trunk/LayoutTests
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r50890 r50892  
     12009-11-12  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=31426
     6        Some WebSocket tests don't properly listen to close event
     7
     8        * websocket/tests/script-tests/handshake-error.js:
     9        * websocket/tests/script-tests/simple.js:
     10        Made the tests clear second-chance timer on finish, avoiding confusing output when running
     11        them in Safari.
     12
     13        * websocket/tests/script-tests/frame-length-longer-than-buffer.js:
     14        * websocket/tests/script-tests/frame-length-skip.js:
     15        * websocket/tests/frame-length-longer-than-buffer-expected.txt:
     16        * websocket/tests/frame-length-skip-expected.txt:
     17        These tests now finish properly.
     18
     19        * websocket/tests/handshake-error-expected.txt:
     20        * websocket/tests/simple-expected.txt:
     21        I'm getting an extra empty line for these tests, which is surprising. But since I didn't
     22        change anything, I assume that it should be there.
     23
    1242009-11-12  Adam Barth  <abarth@webkit.org>
    225

  • trunk/LayoutTests/websocket/tests/frame-length-longer-than-buffer-expected.txt

    r50862 r50892  
    55WebSocket is open
    66received:hello
     7WebSocket is closed
    781
    89PASS areArraysEqual(received_messages, expected_messages) is true

  • trunk/LayoutTests/websocket/tests/frame-length-skip-expected.txt

    r50862 r50892  
    66received:hello
    77received:world
     8WebSocket is closed
    892
    910PASS areArraysEqual(received_messages, expected_messages) is true

  • trunk/LayoutTests/websocket/tests/handshake-error-expected.txt

    r50795 r50892  
    88
    99TEST COMPLETE
     10

  • trunk/LayoutTests/websocket/tests/script-tests/frame-length-longer-than-buffer.js

    r50862 r50892  
    66var expected_messages = ["hello"];
    77function finish() {
     8    clearTimeout(timeoutID);
    89    debug(received_messages.length);
    910    for (var i = 0; i < received_messages; i++) {
    … …  
    2627    received_messages.push(evt.data);
    2728};
    28 ws.close = function () {
     29ws.onclose = function () {
    2930    debug("WebSocket is closed");
    3031    finish();
    3132};
    32 setTimeout("finish()", 2000);
     33var timeoutID = setTimeout("finish()", 2000);
    3334
    3435var successfullyParsed = true;

  • trunk/LayoutTests/websocket/tests/script-tests/frame-length-skip.js

    r50862 r50892  
    66var expected_messages = ["hello", "world"];
    77function finish() {
     8    clearTimeout(timeoutID);
    89    debug(received_messages.length);
    910    for (var i = 0; i < received_messages; i++) {
    … …  
    2627    received_messages.push(evt.data);
    2728};
    28 ws.close = function () {
     29ws.onclose = function () {
    2930    debug("WebSocket is closed");
    3031    finish();
    3132};
    32 setTimeout("finish()", 2000);
     33var timeoutID = setTimeout("finish()", 2000);
    3334
    3435var successfullyParsed = true;

  • trunk/LayoutTests/websocket/tests/script-tests/handshake-error.js

    r50795 r50892  
    88{
    99    isSuccessfullyParsed();
     10    clearTimeout(timeoutID);
    1011    if (window.layoutTestController) {
    1112        layoutTestController.notifyDone();
    … …  
    3839}
    3940
    40 window.setTimeout(timeOutCallback, 3000);
     41var timeoutID = setTimeout(timeOutCallback, 3000);
    4142
    4243var successfullyParsed = true;

  • trunk/LayoutTests/websocket/tests/script-tests/simple.js

    r50794 r50892  
    88{
    99    isSuccessfullyParsed();
     10    clearTimeout(timeoutID);
    1011    if (window.layoutTestController) {
    1112        layoutTestController.notifyDone();
    … …  
    3738}
    3839
    39 window.setTimeout(timeOutCallback, 3000);
     40var timeoutID = setTimeout(timeOutCallback, 3000);
    4041
    4142var successfullyParsed = true;

  • trunk/LayoutTests/websocket/tests/simple-expected.txt

    r50794 r50892  
    99
    1010TEST COMPLETE
     11
Note: See TracChangeset for help on using the changeset viewer.