mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 1688521 - Allow mochitest and geckoview-junit on Windows if it has multiple IP address. r=gbrown
Differential Revision: https://phabricator.services.mozilla.com/D102895
This commit is contained in:
parent
071043917d
commit
2f7bcc8337
@ -1286,10 +1286,7 @@ class AndroidArguments(ArgumentContainer):
|
||||
]
|
||||
|
||||
if options.remoteWebServer is None:
|
||||
if os.name != "nt":
|
||||
options.remoteWebServer = moznetwork.get_ip()
|
||||
else:
|
||||
parser.error("you must specify a --remote-webserver=<ip address>")
|
||||
options.remoteWebServer = moznetwork.get_ip()
|
||||
|
||||
options.webServer = options.remoteWebServer
|
||||
|
||||
|
@ -107,10 +107,7 @@ class JUnitTestRunner(MochitestDesktop):
|
||||
self.websocketProcessBridge = None
|
||||
self.SERVER_STARTUP_TIMEOUT = 180 if mozinfo.info.get("debug") else 90
|
||||
if self.options.remoteWebServer is None:
|
||||
if os.name != "nt":
|
||||
self.options.remoteWebServer = moznetwork.get_ip()
|
||||
else:
|
||||
raise UserError("--remote-webserver must be specified")
|
||||
self.options.remoteWebServer = moznetwork.get_ip()
|
||||
self.options.webServer = self.options.remoteWebServer
|
||||
self.options.webSocketPort = "9988"
|
||||
self.options.httpdPath = None
|
||||
|
Loading…
Reference in New Issue
Block a user