Merge pull request #318 from PengTian0/fix2/node6_8

RAC-5743: unit test doesn't exit after upgrading mocha to 4.0.1
RackHD · Nov 10, 2017 · b91b593 · b91b593
2 parents 465ecc3 + ac1c6e9
commit b91b593
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/lib/common/connection.js b/lib/common/connection.js
@@ -102,7 +102,7 @@ function connectionFactory (assert, amqp, Promise, util, _) {
                     delete self.connection;
                     resolve();
                 });
-
+                self.connection.setImplOptions({reconnect: false});
                 self.connection.disconnect();
             } else {
                 reject(new Error('Connection Not Started.'));

diff --git a/lib/services/statsd.js b/lib/services/statsd.js
@@ -51,6 +51,7 @@ function statsdServiceFactory(
         if(this.started) {
             this.increment('process.stopped');
             this.started = false;
+            this.close();
         }
         return Promise.resolve();
     };

diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "istanbul": "^0.3.5",
     "jsdoc": "^3.3.0-alpha13",
     "jshint": "^2.5.11",
-    "mocha": "^2.1.0",
+    "mocha": "^4.0.1",
     "nock": "~9.0.22",
     "sinon": "1.16.1",
     "sinon-as-promised": "^2.0.3",

diff --git a/spec/lib/common/connection-spec.js b/spec/lib/common/connection-spec.js
@@ -290,7 +290,8 @@ describe('Connection', function () {
                     });
                     this.subject.start().then(function () {
                         return expect(self.subject.stop()).to.be.fulfilled;
-                    });
+                    })
+                    .then(done());
                 });
 
                 it('should reject if not connected', function () {

diff --git a/spec/lib/protocol/dhcp-spec.js b/spec/lib/protocol/dhcp-spec.js
@@ -22,12 +22,10 @@ describe("DHCP protocol functions", function () {
         testSubscription = new Subscription({},{});
         testMessage = new Message({},{},{});
         sinon.stub(testMessage);
-        sinon.stub(messenger);
     });
 
     beforeEach(function() {
-        messenger.subscribe.reset();
-        messenger.request.reset();
+        this.sandbox.stub(messenger, 'request');
     });
 
     helper.after();
@@ -291,4 +289,5 @@ describe("DHCP protocol functions", function () {
             }).should.be.rejectedWith(sampleError);
         });
     });
-});
+});
+
diff --git a/spec/lib/protocol/scheduler-spec.js b/spec/lib/protocol/scheduler-spec.js
@@ -20,7 +20,10 @@ describe("Schedular protocol functions", function () {
         testSubscription = new Subscription({},{});
         testMessage = new Message({},{},{});
         sinon.stub(testMessage);
-        sinon.stub(messenger);
+    });
+
+    beforeEach(function() {
+        this.sandbox.stub(messenger, 'request');
     });
 
     helper.after();

diff --git a/spec/lib/protocol/task-graph-runner-spec.js b/spec/lib/protocol/task-graph-runner-spec.js
@@ -25,7 +25,12 @@ describe("TaskGraph Runner protocol functions", function () {
         testSubscription = new Subscription({},{});
         testMessage = new Message({},{},{});
         sinon.stub(testMessage);
-        sinon.stub(messenger);
+    });
+
+    beforeEach(function() {
+        this.sandbox.stub(messenger, 'request');
+        this.sandbox.stub(messenger, 'publish');
+        this.sandbox.stub(messenger, 'subscribe');
     });
 
     helper.after();
@@ -88,6 +93,7 @@ describe("TaskGraph Runner protocol functions", function () {
 
         it("should subscribe and receive cancelTaskGraph failures", function() {
             var graphId = uuid.v4();
+            messenger.subscribe.restore();
             messenger.request.rejects(sampleError);
             return taskgraphrunner.subscribeCancelTaskGraph(function(_graphId) {
                 expect(_graphId).to.deep.equal(graphId);

diff --git a/spec/lib/protocol/task-spec.js b/spec/lib/protocol/task-spec.js
@@ -22,11 +22,14 @@ describe("Task protocol functions", function() {
         testSubscription = new Subscription({},{});
         testMessage = new Message({},{},{});
         sinon.stub(testMessage);
-        sinon.stub(messenger);
         sinon.stub(testSubscription);
         sinon.stub(events);
     });
 
+    beforeEach(function() {
+        this.sandbox.stub(messenger, 'request');
+        this.sandbox.stub(messenger, 'publish');
+    });
     helper.after();
 
     describe("Run", function() {

diff --git a/spec/lib/protocol/waterline-spec.js b/spec/lib/protocol/waterline-spec.js
@@ -17,23 +17,18 @@ describe('Protocol.Waterline', function() {
         var Subscription = helper.injector.get('Subscription');
         testSubscription = new Subscription({},{});
         sinon.stub(testSubscription);
-        sinon.stub(messenger);
     });
 
     helper.after();
 
     it('should publish a created event', function() {
-        messenger.publish.resolves();
         return waterlineProtocol.publishRecord(collection, 'created', { id: 1 });
     });
-
     it('should publish an updated event', function() {
-        messenger.publish.resolves();
         return waterlineProtocol.publishRecord(collection, 'updated', { id: 1 });
     });
 
     it('should publish a destroyed event', function() {     
-        messenger.publish.resolves();
         return waterlineProtocol.publishRecord(collection, 'destroyed', { id: 1 });
     });
 });