Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1295453 - Don't wait for data to be sent when closing socket immediately r=jdm

Browse Source 
We can't guarantee any data will be written, it should suffice to just
make sure that the socket closes immediately and then verify that
a complete set of data wasn't read.

MozReview-Commit-ID: CHHuJEGRVgX

--HG--
extra : rebase_source : 2269b73a4497011c9604628710055a0fc08e0470
This commit is contained in:
William Lachance 2016-09-06 15:51:51 -04:00
parent af766dd2bc
commit 21a99bf25f
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/network/tests/test_tcpsocket_client_and_server_basics.js
View File

@ -35,6 +35,7 @@ function assertUint8ArraysEqual(a, b, comparingWhat) {
*/
function listenForEventsOnSocket(socket, socketType) {
let wantDataLength = null;
let wantDataAndClose = false;
let pendingResolve = null;
let receivedEvents = [];
let receivedData = null;
@ -51,7 +52,16 @@ function listenForEventsOnSocket(socket, socketType) {
socket.onopen = handleGenericEvent;
socket.ondrain = handleGenericEvent;
socket.onerror = handleGenericEvent;
socket.onclose = handleGenericEvent;
socket.onclose = function(event) {
if (!wantDataAndClose) {
handleGenericEvent(event);
} else if (pendingResolve) {
dump('(' + socketType + ' event: close)\n');
pendingResolve(receivedData);
pendingResolve = null;
wantDataAndClose = false;
}
}
socket.ondata = function(event) {
dump('(' + socketType + ' event: ' + event.type + ' length: ' +
event.data.byteLength + ')\n');
@ -114,6 +124,19 @@ function listenForEventsOnSocket(socket, socketType) {
pendingResolve = resolve;
wantDataLength = length;
});
},
waitForAnyDataAndClose: function() {
if (pendingResolve) {
throw new Error('only one wait allowed at a time.');
}
return new Promise(function(resolve, reject) {
pendingResolve = resolve;
// we may receive no data before getting close, in which case we want to
// return an empty array
receivedData = new Uint8Array();
wantDataAndClose = true;
});
}
};
}
@ -379,13 +402,10 @@ function* test_basics() {
'Server sending more than 64k should result in the buffer being full.');
clientSocket.closeImmediately();
serverReceived = yield serverQueue.waitForDataWithAtLeastLength(1);
serverReceived = yield serverQueue.waitForAnyDataAndClose();
is(serverReceived.length < (2 * bigUint8Array.length), true, 'Received array length less than sent array length');
is((yield serverQueue.waitForEvent()).type, 'close',
'The close event is received after calling closeImmediately');
// -- Close the listening server (and try to connect)
// We want to verify that the server actually closes / stops listening when
// we tell it to.