fix: child suite retries not called

Dmitriy-kiselyov · Dmitriy-kiselyov · commit 6268b62670c1 · 2018-02-26T12:53:02.000+03:00
diff --git a/lib/runner/suite-runner/insistent-suite-runner.js b/lib/runner/suite-runner/insistent-suite-runner.js
@@ -13,7 +13,7 @@ module.exports = class InsistentSuiteRunner extends SuiteRunner {
     }
 
     constructor(suite, browserAgent, config) {
-        super(suite, browserAgent);
+        super(suite.clone(), browserAgent);
 
         this._config = config;
         this._retriesPerformed = 0;
diff --git a/test/unit/runner/suite-runner/insistent-suite-runner.js b/test/unit/runner/suite-runner/insistent-suite-runner.js
@@ -45,18 +45,31 @@ describe('runner/suite-runner/insistent-suite-runner', () => {
 
     afterEach(() => sandbox.restore());
 
-    it('should create regular suite runner', () => {
+    it('should clone suite on creation', () => {
         const suite = makeSuiteStub();
         const browserAgent = mkBrowserAgentStub_();
         const config = mkConfigStub_();
 
+        sandbox.spy(suite, 'clone');
+        const runner = InsistentSuiteRunner.create(suite, browserAgent, config);
+
+        assert.calledOnce(suite.clone);
+        assert.notEqual(suite, runner._suite);
+    });
+
+    it('should create regular suite runner and pass cloned suite', () => {
+        const suite = makeSuiteStub();
+        const browserAgent = mkBrowserAgentStub_('bro');
+        const config = mkConfigStub_();
+
         sandbox.spy(RegularSuiteRunner, 'create');
 
         return InsistentSuiteRunner.create(suite, browserAgent, config)
             .run()
             .then(() => {
                 assert.calledOnce(RegularSuiteRunner.create);
                 assert.calledWith(RegularSuiteRunner.create, suite, browserAgent);
+                assert.notEqual(RegularSuiteRunner.create.getCall(0).args[0], suite);
             });
     });
 
@@ -208,9 +221,9 @@ describe('runner/suite-runner/insistent-suite-runner', () => {
                         assert.notCalled(onError);
 
                         assert.calledOnce(onRetry);
-                        assert.calledWith(onRetry, {
+                        assert.calledWithMatch(onRetry, {
                             foo: 'bar',
-                            suite,
+                            suite: _.omit(suite, 'browsers'),
                             state,
                             browserId: 'bro',
                             attempt: 0,
@@ -228,6 +241,21 @@ describe('runner/suite-runner/insistent-suite-runner', () => {
                     .then(() => assert.callCount(RegularSuiteRunner.prototype.run, 1 + 2));
             });
 
+            it('should not modify original suite', () => {
+                const suite = makeSuiteStub();
+                const state = makeStateStub(suite);
+                const browserAgent = mkBrowserAgentStub_();
+                stubWrappedRun_((runner) => runner.emit(Events.ERROR, {state}));
+                const config = mkConfigStub_({retry: 1});
+
+                sandbox.spy(RegularSuiteRunner, 'create');
+                const suiteBefore = suite.clone();
+
+                return mkInsistentRunner_({suite, browserAgent, config})
+                    .run()
+                    .then(() => assert.deepEqual(suite, suiteBefore));
+            });
+
             it('should count few errors during run for one', () => {
                 const state = makeStateStub();
 
@@ -328,7 +356,7 @@ describe('runner/suite-runner/insistent-suite-runner', () => {
                         assert.calledOnce(onRetry);
                         assert.calledWithMatch(onRetry, {
                             equal: false,
-                            suite,
+                            suite: _.omit(suite, 'browsers'),
                             state,
                             browserId: 'bro',
                             attempt: 0,

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ module.exports = class InsistentSuiteRunner extends SuiteRunner {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`constructor(suite, browserAgent, config) {`
`16`		`- super(suite, browserAgent);`
	`16`	`+ super(suite.clone(), browserAgent);`
`17`	`17`
`18`	`18`	`this._config = config;`
`19`	`19`	`this._retriesPerformed = 0;`