fixed workers issues

Author: DavertMik

lib/command/workers/runTests.js

@@ -1,4 +1,4 @@
-const tty = require('tty')
+import tty from 'tty'
 
 if (!tty.getWindowSize) {
   // this is really old method, long removed from Node, but Mocha
@@ -7,22 +7,18 @@ if (!tty.getWindowSize) {
   tty.getWindowSize = () => [40, 80]
 }
 
-const { parentPort, workerData } = require('worker_threads')
-const eventModule = require('../../event')
-const event = eventModule.default || eventModule
-const containerModule = require('../../container')
-const container = containerModule.default || containerModule
-const { getConfig } = require('../utils')
-const utilsModule = require('../../utils')
-const { tryOrDefault, deepMerge } = utilsModule.default || utilsModule
+import { parentPort, workerData } from 'worker_threads'
+import event from '../../event.js'
+import container from '../../container.js'
+import { getConfig } from '../utils.js'
+import { tryOrDefault, deepMerge } from '../../utils.js'
 
 let stdout = ''
 
 const stderr = ''
 
-// Requiring of Codecept need to be after tty.getWindowSize is available.
-const CodeceptModule = require(process.env.CODECEPT_CLASS_PATH || '../../codecept')
-const Codecept = CodeceptModule.default || CodeceptModule
+// Importing of Codecept need to be after tty.getWindowSize is available.
+import Codecept from '../../codecept.js'
 
 const { options, tests, testRoot, workerIndex } = workerData
 
@@ -39,44 +35,45 @@ const overrideConfigs = tryOrDefault(() => JSON.parse(options.override), {})
 const config = deepMerge(getConfig(options.config || testRoot), overrideConfigs)
 
 // Load test and run
-const codecept = new Codecept(config, options)
-codecept.init(testRoot)
-codecept.loadTests()
-const mocha = container.mocha()
-filterTests()
-
-// run tests
 ;(async function () {
-  if (mocha.suite.total()) {
-    await runTests()
+  const codecept = new Codecept(config, options)
+  await codecept.init(testRoot)
+  codecept.loadTests()
+  const mocha = container.mocha()
+
+  function filterTests() {
+    const files = codecept.testFiles
+    mocha.files = files
+    mocha.loadFiles()
+
+    for (const suite of mocha.suite.suites) {
+      suite.tests = suite.tests.filter(test => tests.indexOf(test.uid) >= 0)
+    }
   }
-})()
 
-async function runTests() {
-  try {
-    await codecept.bootstrap()
-  } catch (err) {
-    throw new Error(`Error while running bootstrap file :${err}`)
-  }
-  listenToParentThread()
-  initializeListeners()
-  disablePause()
-  try {
-    await codecept.run()
-  } finally {
-    await codecept.teardown()
+  async function runTests() {
+    try {
+      await codecept.bootstrap()
+    } catch (err) {
+      throw new Error(`Error while running bootstrap file :${err}`)
+    }
+    listenToParentThread()
+    initializeListeners()
+    disablePause()
+    try {
+      await codecept.run()
+    } finally {
+      await codecept.teardown()
+    }
   }
-}
 
-function filterTests() {
-  const files = codecept.testFiles
-  mocha.files = files
-  mocha.loadFiles()
+  filterTests()
 
-  for (const suite of mocha.suite.suites) {
-    suite.tests = suite.tests.filter(test => tests.indexOf(test.uid) >= 0)
+  // run tests
+  if (mocha.suite.total()) {
+    await runTests()
   }
-}
+})()
 
 function initializeListeners() {
   // suite

lib/mocha/test.js

@@ -1,7 +1,7 @@
 import Test from 'mocha/lib/test.js'
 import Suite from 'mocha/lib/suite.js'
 import { genTestId, serializeError, clearString, relativeDir } from '../utils.js'
-import step from '../step/base.js'
+import Step from '../step/base.js'
 import { enhanceMochaSuite } from './suite.js'
 import { test as testWrapper } from './asyncWrapper.js'
 /**
@@ -166,14 +166,7 @@ function testToFileName(test, { suffix = '', unique = false } = {}) {
   return fileName
 }
 
-export {
-  createTest,
-  testToFileName,
-  enhanceMochaTest,
-  serializeTest,
-  deserializeTest,
-  cloneTest,
-}
+export { createTest, testToFileName, enhanceMochaTest, serializeTest, deserializeTest, cloneTest }
 
 export default {
   createTest,

lib/workers.js

@@ -235,15 +235,27 @@ class Workers extends EventEmitter {
   constructor(numberOfWorkers, config = { by: 'test' }) {
     super()
     this.setMaxListeners(50)
-    this.codecept = initializeCodecept(config.testConfig, config.options)
+    this.codeceptPromise = initializeCodecept(config.testConfig, config.options)
+    this.codecept = null
     this.errors = []
     this.numberOfWorkers = 0
     this.closedWorkers = 0
     this.workers = []
     this.testGroups = []
+    this.config = config
+    this.numberOfWorkersRequested = numberOfWorkers
 
     createOutputDir(config.testConfig)
-    if (numberOfWorkers) this._initWorkers(numberOfWorkers, config)
+    // Defer worker initialization until codecept is ready
+  }
+
+  async _ensureInitialized() {
+    if (!this.codecept) {
+      this.codecept = await this.codeceptPromise
+      if (this.numberOfWorkersRequested) {
+        this._initWorkers(this.numberOfWorkersRequested, this.config)
+      }
+    }
   }
 
   _initWorkers(numberOfWorkers, config) {
@@ -344,14 +356,17 @@ class Workers extends EventEmitter {
   }
 
   async bootstrapAll() {
+    await this._ensureInitialized()
     return runHook(this.codecept.config.bootstrapAll, 'bootstrapAll')
   }
 
   async teardownAll() {
+    await this._ensureInitialized()
     return runHook(this.codecept.config.teardownAll, 'teardownAll')
   }
 
-  run() {
+  async run() {
+    await this._ensureInitialized()
     recorder.startUnlessRunning()
     event.dispatcher.emit(event.workers.before)
     process.env.RUNS_WITH_WORKERS = 'true'