Don't restart timeout timer when receiving events from timed out workers

It can take longer for workers to exit than the timeout period, in which
case restarting the timeout timer just causes it to fire again.

Author: novemberborn

api.js

@@ -52,6 +52,7 @@ class Api extends Emittery {
 		const failFast = apiOptions.failFast === true;
 		let bailed = false;
 		const pendingWorkers = new Set();
+		const timedOutWorkerFiles = new Set();
 		let restartTimer;
 		if (apiOptions.timeout) {
 			const timeout = ms(apiOptions.timeout);
@@ -64,6 +65,7 @@ class Api extends Emittery {
 				}
 
 				for (const worker of pendingWorkers) {
+					timedOutWorkerFiles.add(worker.file);
 					worker.exit();
 				}
 
@@ -98,8 +100,11 @@ class Api extends Emittery {
 				}
 
 				runStatus.on('stateChange', record => {
-					// Restart the timer whenever there is activity.
-					restartTimer();
+					if (record.testFile && !timedOutWorkerFiles.has(record.testFile)) {
+						// Restart the timer whenever there is activity from workers that
+						// haven't already timed out.
+						restartTimer();
+					}
 
 					if (failFast && (record.type === 'hook-failed' || record.type === 'test-failed' || record.type === 'worker-failed')) {
 						// Prevent new test files from running once a test has failed.

lib/fork.js

@@ -120,6 +120,7 @@ module.exports = (file, opts, execArgv) => {
 			return emitter.on('stateChange', listener);
 		},
 
+		file,
 		promise
 	};
 };

profile.js

@@ -110,6 +110,7 @@ babelConfigHelper.build(process.cwd(), cacheDir, babelConfigHelper.validate(conf
 
 		const runStatus = new RunStatus([file]);
 		runStatus.observeWorker({
+			file,
 			onStateChange(listener) {
 				const emit = evt => listener(Object.assign(evt, {testFile: file}));
 				process.send = data => {