Merge 86a898f into 6c241fa

macacajs · Apr 25, 2016 · 857d91c · 857d91c
2 parents 6c241fa + 86a898f
commit 857d91c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/bin/macaca-client b/bin/macaca-client
@@ -110,6 +110,10 @@ function init(error, data) {
     process.exit('process exited with code ' + code);
   });
 
+  bootstrap.on('exit', function(code) {
+    process.exit(code);
+  });
+
   bootstrap.on('message', function(e) {
     switch (e.signal) {
       case 'kill':

diff --git a/bin/macaca-client-run b/bin/macaca-client-run
@@ -98,7 +98,7 @@ runner.on('error', function(err) {
   logger.warn(err);
 });
 
-runner.on('close', function() {
+runner.on('close', function(code, signal) {
   if (chunks) {
     try {
       var body = convert.toHtml(chunks.join(EOL));
@@ -130,4 +130,5 @@ runner.on('close', function() {
     }
   }
   logger.info('Test completed!');
+  process.exit(code);
 });
diff --git a/lib/run/index.js b/lib/run/index.js
@@ -56,17 +56,12 @@ Runner.prototype.initMocha = function() {
     this.emit('data', data);
   });
 
-  mocha.on('error', data => {
-    this.emit('error', data);
+  mocha.on('error', err => {
+    this.emit('error', err);
   });
 
-  mocha.on('close', data => {
-    this.emit('close', data);
-    if (!this.options.always) {
-      process.send({
-        signal: 'kill'
-      });
-    }
+  mocha.on('close', (code, signal) => {
+    this.emit('close', code, signal);
   });
 
   this.mocha = mocha;