Merge pull request #714 from johanneswuerbach/callback-already-called

Fix Error: Callback was already called.

lib/app.js

@@ -222,11 +222,6 @@ App.prototype = {
     browser.tryAttach(browserName, id, socket);
   },
 
-  removeRunner: function(runner) {
-    _.remove(this.runners, runner);
-    this.emit('runnerRemoved', runner);
-  },
-
   addRunner: function(runner) {
     this.runners.push(runner);
     this.emit('runnerAdded', runner);

lib/launcher.js

@@ -178,29 +178,24 @@ Launcher.prototype = {
       }
       return;
     }
-    var launcherProcess = this.process;
+
+    this.process.removeListener('close', this.onClose.bind(this));
+    this.process.removeListener('error', this.onError.bind(this));
+
     var self = this;
     sig = sig || 'SIGTERM';
-
-    var exited = false;
-    launcherProcess.on('close', function(code, sig) {
-      if (exited) {
-        return;
-      }
-      exited = true;
+    this.process.once('close', function(code, sig) {
+      self.process = null;
       if (self._killTimer) {
         clearTimeout(self._killTimer);
         self._killTimer = null;
       }
       log.info('Process ' + self.name + ' terminated.', code, sig);
-      launcherProcess.stdout.removeAllListeners();
-      launcherProcess.stderr.removeAllListeners();
-      launcherProcess.removeAllListeners();
       if (cb) {
         cb(null, code);
       }
     });
-    launcherProcess.on('error', function(err) {
+    this.process.on('error', function(err) {
       log.error('Error killing process ' + self.name + '.', err);
     });
     this._killTimer = setTimeout(this.onKillTimeout.bind(this), this.killTimeout);

lib/runners/browser_test_runner.js

@@ -186,7 +186,7 @@ BrowserTestRunner.prototype = {
     return this.quit(this.onFinish);
   },
   quit: function(cb) {
-    log.info('Browser ' + this.name() + ' terminated.');
+    log.info('Closing browser ' + this.name() + '.');
     this.launcher.kill(null, cb);
   }
 };

lib/runners/tap_process_test_runner.js

@@ -13,9 +13,10 @@ TapProcessTestRunner.prototype = {
   start: function(onFinish) {
     this.finished = false;
     this.onFinish = onFinish;
+    this.launcher.once('processError', this.onProcessError.bind(this));
+
     this.launcher.start();
     this.launcher.process.stdout.pipe(this.tapConsumer.stream);
-    this.launcher.once('processError', this.onProcessError.bind(this));
 
     this.tapConsumer.on('test-result', this.onTestResult.bind(this));
     this.tapConsumer.on('all-test-results', this.onAllTestResults.bind(this));

tests/fixtures/ignore_sigterm.js → tests/fixtures/processes/ignore_sigterm.js

@@ -1,6 +1,6 @@
+process.stdin.resume();
+
 process.on('SIGTERM', function() {
   // Ignore
   console.log('SIGTERM ignored');
 });
-
-process.stdin.resume();

tests/launcher_tests.js

@@ -105,13 +105,12 @@ describe('Launcher', function() {
       });
     });
     it('sends SIGKILL when SIGTERM is ignored', function(done) {
-      settings.command = 'node ' + path.join(__dirname, 'fixtures/ignore_sigterm');
+      settings.command = 'node ' + path.join(__dirname, 'fixtures/processes/ignore_sigterm.js');
       launcher.start();
       launcher.killTimeout = 200;
-      launcher.on('processExit', function() {
-        done();
-      });
-      launcher.kill();
+      setTimeout(function() {
+        launcher.kill(null, done);
+      }, 200);
     });
   });
 

tests/runners/tap_process_test_runner_tests.js

@@ -256,9 +256,9 @@ describe('tap process test runner', function() {
 
     it('not errored processes', function(done) {
       var settings = {
-        exe: 'node-not-found'
+        exe: 'nope-not-existing'
       };
-      var launcher = new Launcher('node-tap-bail-out', settings, config);
+      var launcher = new Launcher('nope-not-existing', settings, config);
       var runner = new TapProcessTestRunner(launcher, reporter);
 
       runner.start(function() {