Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: tools/telemetry/telemetry/browser_backend.py

Issue 11348217: [telemetry] Removing flake in wpr_server.py caused by static port assignment from chrome/test/funct… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move away from pylib Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/telemetry/telemetry/browser.py ('k') | tools/telemetry/telemetry/cros_browser_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/browser_backend.py
diff --git a/tools/telemetry/telemetry/browser_backend.py b/tools/telemetry/telemetry/browser_backend.py
index de9e0929bb618401f0e7f3604d303952a279296d..8aebba45530c3eaa0e683571176c8f2e323fba20 100644
--- a/tools/telemetry/telemetry/browser_backend.py
+++ b/tools/telemetry/telemetry/browser_backend.py
@@ -23,8 +23,6 @@ class BrowserBackend(object):
once a remote-debugger port has been established."""
WEBPAGEREPLAY_HOST = '127.0.0.1'
- WEBPAGEREPLAY_HTTP_PORT = 8080
- WEBPAGEREPLAY_HTTPS_PORT = 8413
def __init__(self, is_content_shell, options):
self.browser_type = options.browser_type
@@ -38,6 +36,11 @@ class BrowserBackend(object):
self._webkit_base_revision = 0
self._tracing_backend = None
+ self.webpagereplay_local_http_port = util.GetAvailableLocalPort()
+ self.webpagereplay_local_https_port = util.GetAvailableLocalPort()
+ self.webpagereplay_remote_http_port = self.webpagereplay_local_http_port
+ self.webpagereplay_remote_https_port = self.webpagereplay_local_https_port
+
if options.dont_override_profile and not options_for_unittests.AreSet():
sys.stderr.write('Warning: Not overriding profile. This can cause '
'unexpected effects due to profile-specific settings, '
@@ -64,9 +67,10 @@ class BrowserBackend(object):
args.append('--metrics-recording-only')
args.append('--no-first-run')
if self.options.wpr_mode != wpr_modes.WPR_OFF:
- args.extend(wpr_server.GetChromeFlags(self.WEBPAGEREPLAY_HOST,
- self.WEBPAGEREPLAY_HTTP_PORT,
- self.WEBPAGEREPLAY_HTTPS_PORT))
+ args.extend(wpr_server.GetChromeFlags(
+ self.WEBPAGEREPLAY_HOST,
+ self.webpagereplay_remote_http_port,
+ self.webpagereplay_remote_https_port))
args.extend(user_agent.GetChromeUserAgentArgumentFromType(
self.options.browser_user_agent_type))
return args
@@ -137,6 +141,9 @@ class BrowserBackend(object):
def GetTrace(self):
return self._tracing_backend.GetTraceAndReset()
+ def GetRemotePort(self, _):
+ return util.GetAvailableLocalPort()
+
def Close(self):
if self._tracing_backend:
self._tracing_backend.Close()
« no previous file with comments | « tools/telemetry/telemetry/browser.py ('k') | tools/telemetry/telemetry/cros_browser_backend.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698