Skip to content

Commit 59cd7e9

Browse files
committed
tests: fix event race condition in test streaming destroy
1 parent a783de6 commit 59cd7e9

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

test/FakeServer.js

+2
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ FakeConnection.prototype._writePacketStream = function _writePacketStream(count)
340340
var timer = setInterval(writeRow.bind(this), 20);
341341

342342
this._socket.on('close', cleanup);
343+
this._socket.on('error', cleanup);
343344

344345
this._sendPacket(new Packets.ResultSetHeaderPacket({
345346
fieldCount: 2
@@ -366,6 +367,7 @@ FakeConnection.prototype._writePacketStream = function _writePacketStream(count)
366367
function cleanup() {
367368
var socket = this._socket || this;
368369
socket.removeListener('close', cleanup);
370+
socket.removeListener('error', cleanup);
369371
clearInterval(timer);
370372
}
371373

test/unit/query/test-streaming-destroy.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ server.listen(common.fakeServerPort, function (err) {
1414
count++;
1515
assert.equal(count, 1);
1616
connection.destroy();
17-
server.destroy();
17+
18+
process.nextTick(function () {
19+
server.destroy();
20+
});
1821
});
1922
});

0 commit comments

Comments
 (0)