tests: fix event race condition in test streaming destroy

mysqljs · May 13, 2015 · 59cd7e9 · 59cd7e9
1 parent a783de6
commit 59cd7e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/test/FakeServer.js b/test/FakeServer.js
@@ -340,6 +340,7 @@ FakeConnection.prototype._writePacketStream = function _writePacketStream(count)
   var timer = setInterval(writeRow.bind(this), 20);
 
   this._socket.on('close', cleanup);
+  this._socket.on('error', cleanup);
 
   this._sendPacket(new Packets.ResultSetHeaderPacket({
     fieldCount: 2
@@ -366,6 +367,7 @@ FakeConnection.prototype._writePacketStream = function _writePacketStream(count)
   function cleanup() {
     var socket = this._socket || this;
     socket.removeListener('close', cleanup);
+    socket.removeListener('error', cleanup);
     clearInterval(timer);
   }
 

diff --git a/test/unit/query/test-streaming-destroy.js b/test/unit/query/test-streaming-destroy.js
@@ -14,6 +14,9 @@ server.listen(common.fakeServerPort, function (err) {
     count++;
     assert.equal(count, 1);
     connection.destroy();
-    server.destroy();
+
+    process.nextTick(function () {
+      server.destroy();
+    });
   });
 });