fix: do not store all mocha instances in workers

lib/runner/index.js

@@ -48,7 +48,7 @@ module.exports = class MainRunner extends AsyncEmitter {
     }
 
     run(testFiles) {
-        const workers = Workers.create(testFiles, this._config);
+        const workers = Workers.create(this._config);
 
         return this.emitAndWait(RunnerEvents.RUNNER_START, this)
             .then(() => {

lib/runner/mocha-runner/mocha-adapter.js

@@ -200,7 +200,7 @@ module.exports = class MochaAdapter extends EventEmitter {
                 const start = Date.now();
                 let isBrokenSession = false;
 
-                return workers.runTest(fullTitle, {browserId: browser.id, sessionId: browser.sessionId})
+                return workers.runTest(fullTitle, {browserId: browser.id, sessionId: browser.sessionId, file: test.file})
                     .then((data) => {
                         this._extendTestInfo(test, data);
                         browser.updateChanges(data.changes);

lib/runner/workers.js

@@ -9,8 +9,7 @@ module.exports = class Workers {
         return new Workers(...args);
     }
 
-    constructor(testFiles, config) {
-        this._testFiles = testFiles;
+    constructor(config) {
         this._config = config;
 
         this._workers = this._createWorkerFarm();
@@ -45,7 +44,6 @@ module.exports = class Workers {
                 case 'worker.init':
                     child.send({
                         event: 'master.init',
-                        testFiles: this._testFiles,
                         configPath: this._config.configPath,
                         runtimeConfig: RuntimeConfig.getInstance()
                     });

lib/worker/hermione-facade.js

@@ -43,15 +43,14 @@ module.exports = class HermioneFacade {
             debug('init worker');
             process.send({event: 'worker.init'});
 
-            process.on('message', ({event, testFiles, configPath, runtimeConfig} = {}) => {
+            process.on('message', ({event, configPath, runtimeConfig} = {}) => {
                 if (event !== 'master.init') {
                     return;
                 }
 
                 try {
-                    const hermione = Hermione.create(configPath);
-                    hermione.init(testFiles);
                     RuntimeConfig.getInstance().extend(runtimeConfig);
+                    const hermione = Hermione.create(configPath);
 
                     debug('worker initialized');
                     resolve(hermione);

lib/worker/hermione.js

@@ -7,7 +7,9 @@ const Runner = require('./runner');
 const BaseHermione = require('../base-hermione');
 
 module.exports = class Hermione extends BaseHermione {
-    init(testFiles) {
+    constructor(configPath) {
+        super(configPath);
+
         this._runner = Runner.create(this._config);
 
         eventsUtils.passthroughEvent(this._runner, this, [
@@ -16,8 +18,6 @@ module.exports = class Hermione extends BaseHermione {
 
             RunnerEvents.NEW_BROWSER
         ]);
-
-        this._runner.init(testFiles);
     }
 
     runTest(fullTitle, options) {

lib/worker/browser-pool.js → lib/worker/runner/browser-pool.js

@@ -2,8 +2,8 @@
 
 const {Calibrator} = require('gemini-core');
 const _ = require('lodash');
-const Browser = require('../browser/existing-browser');
-const RunnerEvents = require('./constants/runner-events');
+const Browser = require('../../browser/existing-browser');
+const RunnerEvents = require('../constants/runner-events');
 
 module.exports = class BrowserPool {
     static create(config, emitter) {

lib/worker/runner/index.js

@@ -1,15 +1,15 @@
 'use strict';
 
-const _ = require('lodash');
 const AsyncEmitter = require('gemini-core').events.AsyncEmitter;
 const eventsUtils = require('gemini-core').events.utils;
-const BrowserPool = require('../browser-pool');
 const RunnerEvents = require('../constants/runner-events');
-const MochaRunner = require('./mocha-runner');
+const BrowserPool = require('./browser-pool');
+const BrowserAgent = require('./browser-agent');
+const MochaAdapter = require('./mocha-adapter');
 
-module.exports = class MainRunner extends AsyncEmitter {
+module.exports = class Runner extends AsyncEmitter {
     static create(config) {
-        return new MainRunner(config);
+        return new Runner(config);
     }
 
     constructor(config) {
@@ -18,29 +18,26 @@ module.exports = class MainRunner extends AsyncEmitter {
         this._config = config;
         this._browserPool = BrowserPool.create(this._config, this);
 
-        MochaRunner.prepare();
+        MochaAdapter.prepare();
     }
 
-    init(testPaths) {
-        this._mochaRunners = _.mapValues(testPaths, (files, browserId) => {
-            return this._createMochaRunner(browserId).init(files);
-        });
+    runTest(fullTitle, options) {
+        return this._createMocha(fullTitle, options.file, options.browserId)
+            .runInSession(options.sessionId);
     }
 
-    _createMochaRunner(browserId) {
-        const mochaRunner = MochaRunner.create(browserId, this._config, this._browserPool);
+    _createMocha(fullTitle, file, browserId) {
+        const browserAgent = BrowserAgent.create(browserId, this._browserPool);
+        const mocha = MochaAdapter.create(browserAgent, this._config.system);
 
-        eventsUtils.passthroughEvent(mochaRunner, this, [
+        eventsUtils.passthroughEvent(mocha, this, [
             RunnerEvents.BEFORE_FILE_READ,
-            RunnerEvents.AFTER_FILE_READ,
-
-            RunnerEvents.NEW_BROWSER
+            RunnerEvents.AFTER_FILE_READ
         ]);
 
-        return mochaRunner;
-    }
+        mocha.attachTestFilter((test) => test.fullTitle() === fullTitle);
+        mocha.loadFiles(file);
 
-    runTest(fullTitle, options) {
-        return this._mochaRunners[options.browserId].runTest(fullTitle, options.sessionId);
+        return mocha;
     }
 };

lib/worker/runner/mocha-runner/mocha-adapter.js → lib/worker/runner/mocha-adapter.js

@@ -6,12 +6,12 @@ const clearRequire = require('clear-require');
 const _ = require('lodash');
 const Mocha = require('mocha');
 const q = require('q');
-const RunnerEvents = require('../../../constants/runner-events');
-const Skip = require('../../../runner/mocha-runner/skip');
-const SkipBuilder = require('../../../runner/mocha-runner/skip/skip-builder');
-const OnlyBuilder = require('../../../runner/mocha-runner/skip/only-builder');
-const ProxyReporter = require('../../../runner/mocha-runner/proxy-reporter');
-const {getShortMD5} = require('../../../../lib/utils/crypto');
+const RunnerEvents = require('../constants/runner-events');
+const Skip = require('../../runner/mocha-runner/skip');
+const SkipBuilder = require('../../runner/mocha-runner/skip/skip-builder');
+const OnlyBuilder = require('../../runner/mocha-runner/skip/only-builder');
+const ProxyReporter = require('../../runner/mocha-runner/proxy-reporter');
+const {getShortMD5} = require('../../../lib/utils/crypto');
 
 // Avoid mochajs warning about possible EventEmitter memory leak
 // https://nodejs.org/docs/latest/api/events.html#events_emitter_setmaxlisteners_n
@@ -173,14 +173,6 @@ module.exports = class MochaAdapter extends EventEmitter {
         };
     }
 
-    reinit() {
-        this._initMocha();
-    }
-
-    isFailed() {
-        return Boolean(this._fail);
-    }
-
     attachTestFilter(shouldRunTest) {
         this._addEventHandler('test', (test) => {
             if (shouldRunTest(test)) {

test/lib/runner/index.js

@@ -105,9 +105,9 @@ describe('Runner', () => {
                 const config = makeConfigStub();
                 const runner = new Runner(config);
 
-                return runner.run({foo: 'bar'})
+                return runner.run()
                     .then(() => {
-                        assert.calledOnceWith(Workers.create, {foo: 'bar'}, config);
+                        assert.calledOnceWith(Workers.create, config);
                     });
             });
 

test/lib/runner/mocha-runner/mocha-adapter.js

@@ -636,10 +636,10 @@ describe('mocha-runner/mocha-adapter', () => {
 
             browserAgent.getBrowser.returns(q({id: 'bro-id', sessionId: '100-500'}));
 
-            MochaStub.lastInstance.updateSuiteTree((suite) => suite.addTest({title: 'test-title'}));
+            MochaStub.lastInstance.updateSuiteTree((suite) => suite.addTest({title: 'test-title', file: 'some/file'}));
 
             return mochaAdapter.run(workers)
-                .then(() => assert.calledOnceWith(workers.runTest, 'test-title', {browserId: 'bro-id', sessionId: '100-500'}));
+                .then(() => assert.calledOnceWith(workers.runTest, 'test-title', {browserId: 'bro-id', sessionId: '100-500', file: 'some/file'}));
         });
 
         it('should extend test with browser data', () => {