tests: improve timeout tests

Author: dougwilson

test/unit/connection/test-query-timeout.js

@@ -3,29 +3,27 @@ var common     = require('../../common');
 var connection = common.createConnection({port: common.fakeServerPort});
 var server     = common.createFakeServer();
 
-var connClosed = false;
+var timer = setTimeout(function () {
+  throw new Error('test timeout');
+}, 2000);
 
 server.listen(common.fakeServerPort, function(err) {
   if (err) throw err;
 
-  connection.query({sql: 'SELECT 1', timeout: 20}, function (err, rows) {
+  connection.query({sql: 'SELECT 1', timeout: 200}, function (err, rows) {
     assert.ok(err);
     assert.equal(err.code, 'PROTOCOL_SEQUENCE_TIMEOUT');
     assert.equal(err.fatal, true);
     assert.equal(err.message, 'Query inactivity timeout');
-    assert.equal(err.timeout, 20);
-
-    setTimeout(function() {
-      assert.ok(connClosed);
-      server.destroy();
-    }, 10);
+    assert.equal(err.timeout, 200);
   });
 });
 
 server.on('connection', function(conn) {
   conn.handshake();
   conn._socket.on('close', function() {
-    connClosed = true;
+    clearTimeout(timer);
+    server.destroy();
   });
   conn.on('query', function(packet) {
     // Do nothing; timeout

test/unit/pool/test-acquire-timeout-existing.js

@@ -1,7 +1,7 @@
 var assert = require('assert');
 var common = require('../../common');
 var pool   = common.createPool({
-  acquireTimeout  : 100,
+  acquireTimeout  : 200,
   connectionLimit : 1,
   port            : common.fakeServerPort
 });