File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
javascript/node/selenium-webdriver Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -121,7 +121,6 @@ const zip = require('./io/zip')
121121const { Browser, Capabilities, Capability } = require ( './lib/capabilities' )
122122const { Zip } = require ( './io/zip' )
123123const { getBinaryPaths } = require ( './common/driverFinder' )
124- const portprober = require ( './net/portprober' )
125124const FIREFOX_CAPABILITY_KEY = 'moz:firefoxOptions'
126125
127126/**
@@ -493,10 +492,6 @@ class ServiceBuilder extends remote.DriverService.Builder {
493492 */
494493 constructor ( opt_exe ) {
495494 super ( opt_exe )
496- if ( ! this . args . includes ( '--connect-existing' ) ) {
497- this . args . append ( '--websocket-port' )
498- this . args . append ( `${ portprober . findFreePort ( ) } ` )
499- }
500495 this . setLoopback ( true ) // Required.
501496 }
502497
Original file line number Diff line number Diff line change @@ -44,6 +44,7 @@ const BrowsingContext = require('./bidi/browsingContext')
4444const BrowsingContextInspector = require ( './bidi/browsingContextInspector' )
4545const ScriptManager = require ( './bidi/scriptManager' )
4646const NetworkInspector = require ( './bidi/networkInspector' )
47+ const portprober = require ( './net/portprober' )
4748const version = require ( './package.json' ) . version
4849
4950const Browser = capabilities . Browser
@@ -676,9 +677,15 @@ class Builder {
676677
677678 case Browser . FIREFOX : {
678679 let service = null
680+ // Allocate a free port for the websocket only when not connecting to an existing instance
681+ // This avoids conflicts when multiple Firefox instances have started
679682 if ( this . firefoxService_ ) {
680683 service = this . firefoxService_ . build ( )
681684 }
685+ if ( ! service ?. args . includes ( '--connect-existing' ) ) {
686+ service ?. args . append ( '--websocket-port' )
687+ service ?. args . append ( `${ portprober . findFreePort ( ) } ` )
688+ }
682689 return createDriver ( firefox . Driver , capabilities , service )
683690 }
684691
You can’t perform that action at this time.
0 commit comments