fix: prevent endless loop when suitesPerSession is set to infinity

leonsabr · leonsabr · commit 2b399b61031a · 2016-12-27T18:27:52.000+03:00
Once all suites have run, runner should perform retries in a new browser session. If parameter suitesPerSession is set to infinity (which is a default value), getBrowser method fails to quit previous session because force quit is missing in the freeBrowser method call, and getBrowser is called again recursively.
diff --git a/lib/runner/browser-runner/browser-agent.js b/lib/runner/browser-runner/browser-agent.js
@@ -17,7 +17,7 @@ module.exports = class BrowserAgent {
         return this._pool.getBrowser(this.browserId)
             .then((browser) => {
                 if (_.includes(this._sessions, browser.sessionId)) {
-                    return this.freeBrowser(browser).then(() => this.getBrowser());
+                    return this.freeBrowser(browser, {force: true}).then(() => this.getBrowser());
                 }
 
                 this._sessions.push(browser.sessionId);
diff --git a/test/unit/runner/browser-runner/browser-agent.js b/test/unit/runner/browser-runner/browser-agent.js
@@ -48,7 +48,7 @@ describe('runner/browser-runner/browser-agent', () => {
             .then((bro) => {
                 assert.equal(bro, otherBro);
                 assert.calledTwice(browserPool.getBrowser);
-                assert.calledWith(browserPool.freeBrowser, someBro);
+                assert.calledWith(browserPool.freeBrowser, someBro, {force: true});
             });
     });
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ module.exports = class BrowserAgent {`
`17`	`17`	`return this._pool.getBrowser(this.browserId)`
`18`	`18`	`.then((browser) => {`
`19`	`19`	`if (_.includes(this._sessions, browser.sessionId)) {`
`20`		`- return this.freeBrowser(browser).then(() => this.getBrowser());`
	`20`	`+ return this.freeBrowser(browser, {force: true}).then(() => this.getBrowser());`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`this._sessions.push(browser.sessionId);`