tests: start using after module to count callbacks

mysqljs · May 8, 2016 · 76648c2 · 76648c2
1 parent 0529f02
commit 76648c2
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 58 deletions.
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "readable-stream": "1.1.14"
   },
   "devDependencies": {
+    "after": "0.8.1",
     "eslint": "1.10.3",
     "istanbul": "0.4.3",
     "require-all": "2.0.0",

diff --git a/test/integration/connection/test-server-timeout-disconnect.js b/test/integration/connection/test-server-timeout-disconnect.js
@@ -1,3 +1,4 @@
+var after  = require('after');
 var assert = require('assert');
 var common = require('../../common');
 
@@ -8,11 +9,9 @@ var timeout = setTimeout(function () {
 common.getTestConnection(function (err, connection) {
   assert.ifError(err);
 
-  var wait = 2;
-  function done() {
-    if (--wait) return;
+  var done = after(2, function () {
     clearTimeout(timeout);
-  }
+  });
 
   connection.query('SET wait_timeout = 1', assert.ifError);
 

diff --git a/test/unit/connection/test-domains.js b/test/unit/connection/test-domains.js
@@ -1,3 +1,4 @@
+var after  = require('after');
 var assert = require('assert');
 var common = require('../../common');
 var domain = null;
@@ -15,12 +16,10 @@ var d3 = domain.create();
 var d4 = domain.create();
 
 var server = common.createFakeServer();
-var wait   = 4;
 
-function done() {
-  if (--wait) return;
+var done = after(4, function () {
   server.destroy();
-}
+});
 
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);

diff --git a/test/unit/connection/test-fatal-connect-error.js b/test/unit/connection/test-fatal-connect-error.js
@@ -1,3 +1,4 @@
+var after      = require('after');
 var assert     = require('assert');
 var common     = require('../../common');
 var connection = common.createConnection({port: common.fakeServerPort});
@@ -8,11 +9,9 @@ var server = common.createFakeServer();
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);
 
-  var wait = 3;
-  function done() {
-    if (--wait) return;
+  var done = after(3, function () {
     server.destroy();
-  }
+  });
 
   connection.connect(function (err) {
     assert.ok(err, 'got error');

diff --git a/test/unit/connection/test-fatal-network-error-going-to-all-callbacks.js b/test/unit/connection/test-fatal-network-error-going-to-all-callbacks.js
@@ -1,3 +1,4 @@
+var after      = require('after');
 var assert     = require('assert');
 var common     = require('../../common');
 var connection = common.createConnection({port: common.bogusPort});
@@ -6,11 +7,9 @@ var timer = setTimeout(function () {
   throw new Error('test timeout');
 }, 5000);
 
-var wait = 2;
-function done() {
-  if (--wait) return;
+var done = after(2, function () {
   clearTimeout(timer);
-}
+});
 
 connection.connect(function (err) {
   assert.ok(err, 'got connect error');

diff --git a/test/unit/connection/test-query-after-end-without-callback.js b/test/unit/connection/test-query-after-end-without-callback.js
@@ -1,3 +1,4 @@
+var after      = require('after');
 var assert     = require('assert');
 var common     = require('../../common');
 var connection = common.createConnection({port: common.fakeServerPort});
@@ -7,11 +8,9 @@ var server = common.createFakeServer();
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);
 
-  var wait = 2;
-  function done() {
-    if (--wait) return;
+  var done = after(2, function () {
     server.destroy();
-  }
+  });
 
   connection.connect(assert.ifError);
 

diff --git a/test/unit/connection/test-query-after-end.js b/test/unit/connection/test-query-after-end.js
@@ -1,3 +1,4 @@
+var after      = require('after');
 var assert     = require('assert');
 var common     = require('../../common');
 var connection = common.createConnection({port: common.fakeServerPort});
@@ -7,11 +8,9 @@ var server = common.createFakeServer();
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);
 
-  var wait = 2;
-  function done() {
-    if (--wait) return;
+  var done = after(2, function () {
     server.destroy();
-  }
+  });
 
   connection.connect(assert.ifError);
 

diff --git a/test/unit/pool-cluster/test-connection-order-fatal.js b/test/unit/pool-cluster/test-connection-order-fatal.js
@@ -1,3 +1,4 @@
+var after   = require('after');
 var assert  = require('assert');
 var common  = require('../../common');
 var cluster = common.createPoolCluster();
@@ -14,16 +15,13 @@ server.listen(common.fakeServerPort, function(err) {
   var conn1;
   var conn2;
   var pool = cluster.of('SLAVE*', 'ORDER');
-  var wait = 2;
-
-  function done() {
-    if (--wait) return;
 
+  var done = after(2, function () {
     cluster.end(function (err) {
       assert.ifError(err);
       server.destroy();
     });
-  }
+  });
 
   pool.getConnection(function (err, connection) {
     assert.ifError(err);

diff --git a/test/unit/pool/test-connection-event.js b/test/unit/pool/test-connection-event.js
@@ -1,3 +1,4 @@
+var after  = require('after');
 var assert = require('assert');
 var common = require('../../common');
 var pool   = common.createPool({port: common.fakeServerPort});
@@ -7,23 +8,22 @@ var server = common.createFakeServer();
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);
 
-  var wait = 2;
-  function done() {
+  var done = after(2, function () {
     pool.end(function (err) {
       assert.ifError(err);
       server.destroy();
     });
-  }
+  });
 
   pool.on('connection', function (connection) {
     assert.ok(connection);
-    if (!--wait) return done();
+    done();
   });
 
   pool.getConnection(function (err, connection) {
     assert.ifError(err);
     assert.ok(connection);
     connection.release();
-    if (!--wait) return done();
+    done();
   });
 });
diff --git a/test/unit/pool/test-domains.js b/test/unit/pool/test-domains.js
@@ -1,3 +1,4 @@
+var after  = require('after');
 var assert = require('assert');
 var common = require('../../common');
 var domain = null;
@@ -19,15 +20,13 @@ var d7 = domain.create();
 
 var pool;
 var server = common.createFakeServer();
-var wait   = 4;
 
-function done() {
-  if (--wait) return;
+var done = after(4, function () {
   pool.end(function (err) {
     assert.ifError(err);
     server.destroy();
   });
-}
+});
 
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);

diff --git a/test/unit/pool/test-query-streaming-rows.js b/test/unit/pool/test-query-streaming-rows.js
@@ -1,3 +1,4 @@
+var after  = require('after');
 var assert = require('assert');
 var common = require('../../common');
 var pool   = common.createPool({port: common.fakeServerPort});
@@ -7,14 +8,12 @@ var server = common.createFakeServer();
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);
 
-  var wait = 2;
-  function done() {
-    if (--wait) return;
+  var done = after(2, function () {
     pool.end(function (err) {
       assert.ifError(err);
       server.destroy();
     });
-  }
+  });
 
   pool.getConnection(function (err, connection) {
     assert.ifError(err);

diff --git a/test/unit/query/test-stream-emits-close-after-end.js b/test/unit/query/test-stream-emits-close-after-end.js
@@ -1,3 +1,4 @@
+var after      = require('after');
 var assert     = require('assert');
 var common     = require('../../common');
 var connection = common.createConnection({port: common.fakeServerPort});
@@ -7,16 +8,14 @@ var server = common.createFakeServer();
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);
 
+  var done = after(3, function () {
+    server.destroy();
+  });
+
   var closed = false;
   var ended  = false;
   var query  = connection.query('SELECT * FROM stream LIMIT 2');
   var stream = query.stream();
-  var wait   = 3;
-
-  function done() {
-    if (--wait) return;
-    server.destroy();
-  }
 
   stream.once('close', function () {
     assert.ok(ended);

diff --git a/test/unit/query/test-stream-emits-close.js b/test/unit/query/test-stream-emits-close.js
@@ -1,3 +1,4 @@
+var after      = require('after');
 var assert     = require('assert');
 var common     = require('../../common');
 var connection = common.createConnection({port: common.fakeServerPort});
@@ -7,14 +8,12 @@ var server = common.createFakeServer();
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);
 
+  var done = after(2, function () {
+    server.destroy();
+  });
+
   var query  = connection.query('SELECT * FROM stream LIMIT 2');
   var stream = query.stream();
-  var wait   = 2;
-
-  function done() {
-    if (--wait) return;
-    server.destroy();
-  }
 
   stream.once('close', done);
 

diff --git a/test/unit/query/test-streaming-rows.js b/test/unit/query/test-streaming-rows.js
@@ -1,3 +1,4 @@
+var after      = require('after');
 var assert     = require('assert');
 var common     = require('../../common');
 var connection = common.createConnection({port: common.fakeServerPort});
@@ -7,11 +8,9 @@ var server = common.createFakeServer();
 server.listen(common.fakeServerPort, function (err) {
   assert.ifError(err);
 
-  var wait = 2;
-  function done() {
-    if (--wait) return;
+  var done = after(2, function () {
     server.destroy();
-  }
+  });
 
   var count  = 0;
   var paused = false;