diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 07:28:22 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 07:28:22 +0000 |
| commit | 59d6518433e72f62d6f5a202f0ea860b5d74c90e (patch) | |
| tree | 4eed2657e6523ea0d634ca1b0b3c893373ddfbcb /tools/telemetry | |
| parent | 457a04ca20a0b67ae3282dd9fd0318361668f114 (diff) | |
| download | chromium_src-59d6518433e72f62d6f5a202f0ea860b5d74c90e.zip chromium_src-59d6518433e72f62d6f5a202f0ea860b5d74c90e.tar.gz chromium_src-59d6518433e72f62d6f5a202f0ea860b5d74c90e.tar.bz2 | |
[Telemetry] Fix WPR with cros remote.
BUG=321682
Review URL: https://codereview.chromium.org/93073003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py | 6 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/util.py | 2 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/wpr_server.py | 14 |
3 files changed, 13 insertions, 9 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py index 758986c..76921b7 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py @@ -33,6 +33,8 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): self._cri = cri self._is_guest = is_guest + self.wpr_http_port_pair.remote_port = self._cri.GetRemotePort() + self.wpr_https_port_pair.remote_port = self._cri.GetRemotePort() self._remote_debugging_port = self._cri.GetRemotePort() self._port = self._remote_debugging_port self._forwarder = None @@ -81,11 +83,7 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): cri.Chown(self.profile_directory) def GetBrowserStartupArgs(self): - self.wpr_http_port_pair.remote_port = self._cri.GetRemotePort() - self.wpr_https_port_pair.remote_port = self._cri.GetRemotePort() - args = super(CrOSBrowserBackend, self).GetBrowserStartupArgs() - args.extend([ '--enable-smooth-scrolling', '--enable-threaded-compositing', diff --git a/tools/telemetry/telemetry/core/util.py b/tools/telemetry/telemetry/core/util.py index 9816896..24e3eb5 100644 --- a/tools/telemetry/telemetry/core/util.py +++ b/tools/telemetry/telemetry/core/util.py @@ -97,7 +97,7 @@ class PortPair(object): def GetUnreservedAvailableLocalPort(): - """Returns an availbale port on the system. + """Returns an available port on the system. WARNING: This method does not reserve the port it returns, so it may be used by something else before you get to use it. This can lead to flake. diff --git a/tools/telemetry/telemetry/core/wpr_server.py b/tools/telemetry/telemetry/core/wpr_server.py index 51ca389..0e121b79 100644 --- a/tools/telemetry/telemetry/core/wpr_server.py +++ b/tools/telemetry/telemetry/core/wpr_server.py @@ -41,10 +41,16 @@ class ReplayServer(object): self._web_page_replay.replay_options.remove('--no-dns_forwarding') self._web_page_replay.StartServer() - browser_backend.wpr_http_port_pair = util.PortPair( - self._web_page_replay.http_port, self._web_page_replay.http_port) - browser_backend.wpr_https_port_pair = util.PortPair( - self._web_page_replay.https_port, self._web_page_replay.https_port) + browser_backend.wpr_http_port_pair.local_port = ( + self._web_page_replay.http_port) + browser_backend.wpr_http_port_pair.remote_port = ( + browser_backend.wpr_http_port_pair.remote_port or + self._web_page_replay.http_port) + browser_backend.wpr_https_port_pair.local_port = ( + self._web_page_replay.https_port) + browser_backend.wpr_https_port_pair.remote_port = ( + browser_backend.wpr_https_port_pair.remote_port or + self._web_page_replay.https_port) self._forwarder = browser_backend.CreateForwarder( browser_backend.wpr_http_port_pair, browser_backend.wpr_https_port_pair) |