Add assertion to generic pool test, adjust name of optional callback

coopernurse · Jun 17, 2012 · d3d8fd8 · d3d8fd8
1 parent 6fdd2a6
commit d3d8fd8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/generic-pool.js b/lib/generic-pool.js
@@ -364,19 +364,19 @@ exports.Pool = function (factory) {
     return function() {
       var callerArgs = arguments;
       var callerCallback = callerArgs[callerArgs.length - 1];
-      var hasCallback = typeof callerCallback === 'function';
+      var callerHasCallback = typeof callerCallback === 'function';
       me.acquire(function(err, client) {
         if(err) {
-          if(hasCallback) {
+          if(callerHasCallback) {
             callerCallback(err);
           }
           return;
         }
 
-        var args = [client].concat(Array.prototype.slice.call(callerArgs, 0, hasCallback ? -1 : undefined));
+        var args = [client].concat(Array.prototype.slice.call(callerArgs, 0, callerHasCallback ? -1 : undefined));
         args.push(function() {
           me.release(client);
-          if(hasCallback) {
+          if(callerHasCallback) {
             callerCallback.apply(null, arguments);
           }
         });

diff --git a/test/generic-pool.test.js b/test/generic-pool.test.js
@@ -267,14 +267,16 @@ module.exports = {
             idleTimeoutMillis : 100
         });
 
-        var pooledFn = pool.pooled(function(client, arg) {
+        var pooledFn = pool.pooled(function(client, arg, cb) {
           assert.equal(arg, "Arg!");
           assertion_count += 1;
+          cb();
         });
 
         pooledFn("Arg!");
 
         beforeExit(function() {
+          assert.equal(pool.getPoolSize(), 0);
           assert.equal(assertion_count, 1);
         });