diff options
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/browser.py | 7 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/browser_backend.py | 9 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/wpr_server.py | 24 |
3 files changed, 31 insertions, 9 deletions
diff --git a/tools/telemetry/telemetry/browser.py b/tools/telemetry/telemetry/browser.py index cfa2569..62e31c3 100644 --- a/tools/telemetry/telemetry/browser.py +++ b/tools/telemetry/telemetry/browser.py @@ -118,7 +118,12 @@ class Browser(object): assert os.path.isfile(archive_path) self._wpr_server = wpr_server.ReplayServer( - self._backend, archive_path, use_record_mode) + self._backend, + archive_path, + use_record_mode, + self._backend.WEBPAGEREPLAY_HOST, + self._backend.WEBPAGEREPLAY_HTTP_PORT, + self._backend.WEBPAGEREPLAY_HTTPS_PORT) def GetStandardOutput(self): return self._backend.GetStandardOutput() diff --git a/tools/telemetry/telemetry/browser_backend.py b/tools/telemetry/telemetry/browser_backend.py index ff55af4..a20c06a 100644 --- a/tools/telemetry/telemetry/browser_backend.py +++ b/tools/telemetry/telemetry/browser_backend.py @@ -119,6 +119,11 @@ class TabController(object): class BrowserBackend(object): """A base class for browser backends. Provides basic functionality 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.tabs = None self.browser_type = options.browser_type @@ -141,7 +146,9 @@ 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.CHROME_FLAGS) + args.extend(wpr_server.GetChromeFlags(self.WEBPAGEREPLAY_HOST, + self.WEBPAGEREPLAY_HTTP_PORT, + self.WEBPAGEREPLAY_HTTPS_PORT)) args.extend(user_agent.GetChromeUserAgentArgumentFromType( self.options.browser_user_agent_type)) return args diff --git a/tools/telemetry/telemetry/wpr_server.py b/tools/telemetry/telemetry/wpr_server.py index aa30a18..6c202cf 100644 --- a/tools/telemetry/telemetry/wpr_server.py +++ b/tools/telemetry/telemetry/wpr_server.py @@ -14,29 +14,39 @@ sys.path.append( '../../../chrome/test/functional'))) import webpagereplay # pylint: disable=F0401 -CHROME_FLAGS = webpagereplay.CHROME_FLAGS +def GetChromeFlags(replay_host, http_port, https_port): + return webpagereplay.GetChromeFlags(replay_host, http_port, https_port) class ReplayServer(object): - def __init__(self, browser_backend, path, is_record_mode): + def __init__(self, browser_backend, path, is_record_mode, webpagereplay_host, + webpagereplay_http_port, webpagereplay_https_port): self._browser_backend = browser_backend self._forwarder = None self._web_page_replay = None self._is_record_mode = is_record_mode + self._webpagereplay_host = webpagereplay_host + self._webpagereplay_http_port = webpagereplay_http_port + self._webpagereplay_https_port = webpagereplay_https_port # Note: This can cause flake if server doesn't shut down properly and keeps # ports tied up. See crbug.com/157459. self._forwarder = browser_backend.CreateForwarder( - util.PortPair(webpagereplay.HTTP_PORT, - webpagereplay.HTTP_PORT), - util.PortPair(webpagereplay.HTTPS_PORT, - webpagereplay.HTTPS_PORT)) + util.PortPair(self._webpagereplay_http_port, + self._webpagereplay_http_port), + util.PortPair(self._webpagereplay_https_port, + self._webpagereplay_https_port)) options = [] if self._is_record_mode: options.append('--record') if not browser_backend.options.wpr_make_javascript_deterministic: options.append('--inject_scripts=') - self._web_page_replay = webpagereplay.ReplayServer(path, options) + self._web_page_replay = webpagereplay.ReplayServer( + path, + self._webpagereplay_host, + self._webpagereplay_http_port, + self._webpagereplay_https_port, + options) self._web_page_replay.StartServer() def __enter__(self): |