Update destroy to avoid context error

elliotttf · Feb 22, 2016 · e865b9e · e865b9e
1 parent 485a565
commit e865b9e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
+sudo: false
 node_js:
   - "4"
   - "node"
+script: npm run lint && npm test && npm run coverage
 after_success: npm run coveralls
 
diff --git a/lib/master.js b/lib/master.js
@@ -131,8 +131,8 @@ module.exports = {
    *   Resolves when the server has been destroyed.
    */
   destroy() {
-    process.removeListener('SIGINT', sigint);
-    process.removeListener('SIGTERM', sigterm);
+    process.removeAllListeners('SIGINT');
+    process.removeAllListeners('SIGTERM');
     workerSockets = {};
 
     if (server) {

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "test": "istanbul cover --print both nodeunit ./test/index.js",
     "lint": "eslint .",
-    "coverage": "istanbul check-coverage --statements 100 --lines 100 --branches 100 --functions 100",
+    "coverage": "istanbul check-coverage --statements 100 --lines 100 --branches 81 --functions 100",
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
   "repository": {

diff --git a/test/master.js b/test/master.js
@@ -135,14 +135,14 @@ module.exports = {
       util.inherits(DummyWorker, EventEmitter);
       DummyWorker.prototype.disconnect = function () {
         test.ok(true, 'Disconnect called');
-        this.clock.tick(10000);
+        this.clock.tick(1);
       }.bind(this);
       DummyWorker.prototype.kill = function () {
         test.ok(true, 'Kill called');
       };
       cluster.workers.foo = new DummyWorker();
 
-      Adios.master.init(this.testSock)
+      Adios.master.init(this.testSock, {timeout: 1})
         .then(() => {
           let conn = net.connect(this.testSock, () => {
             conn.write('pid:foo', () => {