Bug 621347 - [SeaMonkey, WINNT 5.2, Debug] mochitests-1: intermittent "test_ws_basic_tests.html | Test timed out"; (Bv1) Add/Re-enable '.wasClean' checks from (bug 573227 ->) bug 572975.

r=Olli.Pettay a=(test only).
This commit is contained in:
Serge Gautherie 2011-01-03 14:56:40 +01:00
Родитель 3a28b96109
Коммит 90da367e44
1 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@ -57,6 +57,7 @@ function testWebSocket () {
} }
ws.onclose = function(e) { ws.onclose = function(e) {
is(results.length, 0, "All the messages should have been processed!"); is(results.length, 0, "All the messages should have been processed!");
ok(e.wasClean, "Connection closed cleanly");
testWebSocket2(); testWebSocket2();
} }
ws.onerror = function(e) { ws.onerror = function(e) {
@ -83,6 +84,7 @@ function testWebSocket2() {
} }
ws.onclose = function(e) { ws.onclose = function(e) {
is(messageCount, testCount, "Didn't receive all the messages!"); is(messageCount, testCount, "Didn't receive all the messages!");
ok(e.wasClean, "Connection closed cleanly");
testWebSocket3(); testWebSocket3();
} }
ws.onerror = function(e) { ws.onerror = function(e) {
@ -113,6 +115,7 @@ function testWebSocket3() {
} }
ws.onclose = function(e) { ws.onclose = function(e) {
is(messageCount, testCount, "Didn't receive all the messages!"); is(messageCount, testCount, "Didn't receive all the messages!");
ok(e.wasClean, "Connection closed cleanly");
testWebSocket4(); testWebSocket4();
} }
ws.onerror = function(e) { ws.onerror = function(e) {
@ -140,7 +143,7 @@ function testWebSocket4() {
} }
ws.onclose = function(e) { ws.onclose = function(e) {
is(this, ws, "'this' should point to the WebSocket. (2)"); is(this, ws, "'this' should point to the WebSocket. (2)");
//ok(e.wasClean, "Connection should have closed cleanly."); ok(e.wasClean, "Connection closed cleanly");
testWebSocket5(); testWebSocket5();
} }
ws.onerror = function(e) { ws.onerror = function(e) {
@ -163,7 +166,7 @@ function testWebSocket5() {
this.close(); this.close();
} }
ws.onclose = function(e) { ws.onclose = function(e) {
//ok(e.wasClean, "Connection should have closed cleanly."); ok(e.wasClean, "Connection closed cleanly");
is(this.bufferedAmount, 0, "Shouldn't have anything buffered"); is(this.bufferedAmount, 0, "Shouldn't have anything buffered");
var msg = "some data"; var msg = "some data";
this.send(msg); this.send(msg);