keepalive interval should be in 1000 milliseconds

mocheng · mocheng · commit 021702ef9efc · 2014-06-20T16:21:53.000+08:00
diff --git a/lib/client.js b/lib/client.js
@@ -453,7 +453,7 @@ MqttClient.prototype._setupPingTimer = function() {
     this.pingResp = true;
     this.pingTimer = setInterval(function () {
         that._checkPing();
-    }, this.options.keepalive * 600);
+    }, this.options.keepalive * 1000);
   }
 };
 
diff --git a/test/abstract_client.js b/test/abstract_client.js
@@ -3,6 +3,7 @@
  * Testing dependencies
  */
 var should = require('should')
+  , sinon = require('sinon')
   , MqttClient = require('../lib/client');
 
 module.exports = function(server, createClient, port) {
@@ -376,7 +377,42 @@ module.exports = function(server, createClient, port) {
     });
   });
 
+  describe('keepalive', function () {
+    var clock;
+
+    beforeEach(function() {
+      clock = sinon.useFakeTimers();
+    });
+
+    afterEach(function() {
+      clock.restore();
+    });
+
+    it('should checkPing at keepalive interval', function (done) {
+      var interval = 3,
+      client = createClient(port, {keepalive: interval});
+
+      client._checkPing = sinon.spy();
+
+      client.once('connect', function() {
+
+        clock.tick(interval * 1000);
+        client._checkPing.callCount.should.equal(1);
+
+        clock.tick(interval * 1000);
+        client._checkPing.callCount.should.equal(2);
+
+        clock.tick(interval * 1000);
+        client._checkPing.callCount.should.equal(3);
+
+        client.end()
+        done();
+      });
+    });
+  });
+
   describe('pinging', function () {
+
     it('should set a ping timer', function (done) {
       var client = createClient(port, {keepalive: 3});
       client.once('connect', function() {

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ MqttClient.prototype._setupPingTimer = function() {`
`453`	`453`	`this.pingResp = true;`
`454`	`454`	`this.pingTimer = setInterval(function () {`
`455`	`455`	`that._checkPing();`
`456`		`- }, this.options.keepalive * 600);`
	`456`	`+ }, this.options.keepalive * 1000);`
`457`	`457`	`}`
`458`	`458`	`};`
`459`	`459`