Move coverage worker into jest-worker

packages/jest-runner/package.json

@@ -15,8 +15,7 @@
     "jest-message-util": "^21.2.1",
     "jest-runtime": "^21.2.1",
     "jest-util": "^21.2.1",
-    "pify": "^3.0.0",
-    "throat": "^4.0.0",
-    "worker-farm": "^1.3.1"
+    "jest-worker": "^21.2.1",
+    "throat": "^4.0.0"
   }
 }

packages/jest-runner/src/__tests__/test_runner.test.js

@@ -11,17 +11,17 @@
 const TestRunner = require('../index');
 const {TestWatcher} = require('jest-cli');
 
-let workerFarmMock;
+let mockWorkerFarm;
 
-jest.mock('worker-farm', () => {
-  const mock = jest.fn(
-    (options, worker) =>
-      (workerFarmMock = jest.fn((data, callback) =>
-        require(worker)(data, callback),
-      )),
-  );
-  mock.end = jest.fn();
-  return mock;
+jest.mock('jest-worker', () => {
+  return jest.fn(worker => {
+    return (mockWorkerFarm = {
+      default: jest.fn((data, callback) => require(worker)(data, callback)),
+      end: jest.fn(),
+      getStderr: jest.fn(),
+      getStdout: jest.fn(),
+    });
+  });
 });
 
 jest.mock('../test_worker', () => {});
@@ -44,15 +44,9 @@ test('injects the rawModuleMap into each worker in watch mode', () => {
       {serial: false},
     )
     .then(() => {
-      expect(workerFarmMock.mock.calls).toEqual([
-        [
-          {config, globalConfig, path: './file.test.js', rawModuleMap},
-          expect.any(Function),
-        ],
-        [
-          {config, globalConfig, path: './file2.test.js', rawModuleMap},
-          expect.any(Function),
-        ],
+      expect(mockWorkerFarm.default.mock.calls).toEqual([
+        [{config, globalConfig, path: './file.test.js', rawModuleMap}],
+        [{config, globalConfig, path: './file2.test.js', rawModuleMap}],
       ]);
     });
 });
@@ -72,15 +66,14 @@ test('does not inject the rawModuleMap in serial mode', () => {
       {serial: false},
     )
     .then(() => {
-      expect(workerFarmMock.mock.calls).toEqual([
+      expect(mockWorkerFarm.default.mock.calls).toEqual([
         [
           {
             config,
             globalConfig,
             path: './file.test.js',
             rawModuleMap: null,
           },
-          expect.any(Function),
         ],
         [
           {
@@ -89,7 +82,6 @@ test('does not inject the rawModuleMap in serial mode', () => {
             path: './file2.test.js',
             rawModuleMap: null,
           },
-          expect.any(Function),
         ],
       ]);
     });

packages/jest-runner/src/index.js

@@ -8,6 +8,7 @@
  */
 
 import type {GlobalConfig} from 'types/Config';
+import type {TestResult} from 'types/TestResult';
 import type {
   OnTestFailure,
   OnTestStart,
@@ -17,13 +18,18 @@ import type {
   TestWatcher,
 } from 'types/TestRunner';
 
-import pify from 'pify';
+import type {WorkerData} from './test_worker';
+
 import runTest from './run_test';
 import throat from 'throat';
-import workerFarm from 'worker-farm';
+import Worker from 'jest-worker';
 
 const TEST_WORKER_PATH = require.resolve('./test_worker');
 
+type CoverageWorker = Worker & {
+  default: (WorkerData) => Promise<TestResult>,
+};
+
 class TestRunner {
   _globalConfig: GlobalConfig;
 
@@ -89,17 +95,12 @@ class TestRunner {
     onResult: OnTestSuccess,
     onFailure: OnTestFailure,
   ) {
-    const farm = workerFarm(
-      {
-        autoStart: true,
-        maxConcurrentCallsPerWorker: 1,
-        maxConcurrentWorkers: this._globalConfig.maxWorkers,
-        maxRetries: 2, // Allow for a couple of transient errors.
-      },
-      TEST_WORKER_PATH,
-    );
+    // $FlowFixMe: "default" property will be exposed.
+    const worker: CoverageWorker = new Worker(TEST_WORKER_PATH, {
+      numWorkers: this._globalConfig.maxWorkers,
+    });
+
     const mutex = throat(this._globalConfig.maxWorkers);
-    const worker = pify(farm);
 
     // Send test suites to workers continuously instead of all at once to track
     // the start time of individual tests.
@@ -108,14 +109,16 @@ class TestRunner {
         if (watcher.isInterrupted()) {
           return Promise.reject();
         }
+
         await onStart(test);
-        return worker({
+
+        return worker.default({
           config: test.context.config,
           globalConfig: this._globalConfig,
           path: test.path,
           rawModuleMap: watcher.isWatchMode()
             ? test.context.moduleMap.getRawModuleMap()
-            : null,
+            : undefined,
         });
       });
 
@@ -146,7 +149,7 @@ class TestRunner {
       ),
     );
 
-    const cleanup = () => workerFarm.end(farm);
+    const cleanup = () => worker.end();
     return Promise.race([runAllTests, onInterrupt]).then(cleanup, cleanup);
   }
 }

packages/jest-runner/src/test_worker.js

@@ -22,15 +22,13 @@ import {separateMessageFromStack} from 'jest-message-util';
 import Runtime from 'jest-runtime';
 import runTest from './run_test';
 
-type WorkerData = {|
+export type WorkerData = {|
   config: ProjectConfig,
   globalConfig: GlobalConfig,
   path: Path,
   rawModuleMap?: RawModuleMap,
 |};
 
-type WorkerCallback = (error: ?SerializableError, result?: TestResult) => void;
-
 const formatError = (error: string | Error): SerializableError => {
   if (typeof error === 'string') {
     const {message, stack} = separateMessageFromStack(error);
@@ -69,33 +67,20 @@ const getResolver = (config, rawModuleMap) => {
   }
 };
 
-// Cannot be ESM export because of worker-farm
-module.exports = (
-  {config, globalConfig, path, rawModuleMap}: WorkerData,
-  callback: WorkerCallback,
-) => {
-  let parentExited = false;
-  const disconnectCallback = () => (parentExited = true);
-  const removeListener = () =>
-    process.removeListener('disconnect', disconnectCallback);
-  process.on('disconnect', disconnectCallback);
-
+export default async function({
+  config,
+  globalConfig,
+  path,
+  rawModuleMap,
+}: WorkerData): Promise<TestResult> {
   try {
-    runTest(path, globalConfig, config, getResolver(config, rawModuleMap)).then(
-      result => {
-        removeListener();
-        if (!parentExited) {
-          callback(null, result);
-        }
-      },
-      error => {
-        removeListener();
-        if (!parentExited) {
-          callback(formatError(error));
-        }
-      },
+    return await runTest(
+      path,
+      globalConfig,
+      config,
+      getResolver(config, rawModuleMap),
     );
-  } catch (error) {
-    callback(formatError(error));
+  } catch (err) {
+    throw formatError(err);
   }
 };

packages/jest-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-worker",
-  "version": "21.1.0",
+  "version": "21.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git"