Merge pull request #120 from jamestalmage/jt-kill-forked-processes

Kill every forked process after tests are finished

Author: Vadim Demedes

cli.js

@@ -133,7 +133,8 @@ function sum(arr, key) {
 	return result;
 }
 
-function exit(results) {
+function exit(testRun) {
+	var results = testRun.results;
 	// assemble stats from all tests
 	var stats = results.map(function (result) {
 		return result.stats;
@@ -158,7 +159,10 @@ function exit(results) {
 	// correctly flush the output when multiple test files
 	process.stdout.write('');
 
-	process.exit(failed > 0 ? 1 : 0);
+	// wait for the child processes to exit
+	testRun.childProcesses.finally(function () {
+		process.exit(failed > 0 ? 1 : 0);
+	});
 }
 
 function init(files) {
@@ -178,7 +182,14 @@ function init(files) {
 
 			var tests = files.map(run);
 
-			return Promise.all(tests);
+			return Promise.all(tests).then(function (results) {
+				return {
+					results: results,
+					childProcesses: Promise.map(tests, function (test) {
+						return test.kill();
+					})
+				};
+			});
 		});
 }
 

lib/fork.js

@@ -18,6 +18,21 @@ module.exports = function (args) {
 
 	var ps = childProcess.fork(babel, args, options);
 
+	var killed = false;
+	var killedPromise = new Promise(function (resolve) {
+		ps.on('exit', function (code) {
+			killed = true;
+			resolve(code);
+		});
+	});
+
+	function kill() {
+		if (!killed) {
+			ps.kill();
+		}
+		return killedPromise;
+	}
+
 	var promise = new Promise(function (resolve, reject) {
 		ps.on('results', function (results) {
 			resolve(results);
@@ -31,6 +46,8 @@ module.exports = function (args) {
 		});
 	});
 
+	promise.kill = kill;
+
 	// emit `test` and `stats` events
 	ps.on('message', function (event) {
 		event.data.file = file;

test/fixture/long-running.js

@@ -0,0 +1,12 @@
+'use strict';
+const test = require('../../');
+
+test('long running', function (t) {
+	t.plan(1);
+
+	setTimeout(function () {
+		console.log('I\'m gonna live forever!!');
+	}, 15000);
+
+	t.ok(true);
+});

test/fork.js

@@ -39,3 +39,17 @@ test('rejects on error and streams output', function (t) {
 			t.end();
 		});
 });
+
+test('result.kill forcibly kills process', function (t) {
+	t.plan(1);
+	var start = Date.now();
+	var promise = fork(fixture('long-running.js'))
+		.on('exit', function () {
+			t.ok(Date.now() - start < 10000);
+		});
+
+	promise
+		.then(function () {
+			promise.kill();
+		});
+});