| commit | a5cfb97ee793d849acf0efa4369b43d6f91a9c4d | [log] [tgz] |
|---|---|---|
| author | Allen Li <ayatane@chromium.org> | Tue Dec 27 17:17:22 2016 -0800 |
| committer | chrome-bot <chrome-bot@chromium.org> | Wed Jan 18 19:18:52 2017 -0800 |
| tree | 4aaa1b5b1b07242f6f1466fa45b0192b13d55aaa | |
| parent | 47034eec9d1d1e3bfb6b4fbd1b754d136a263a92 [diff] [blame] |
[autotest] Add get_hostname_addr_map() (squashed) BUG=chromium:666022 TEST=None !Change-Id: I9b3385fd8fba91f67fe968bb7bf85d39792e8c16 [autotest] Add hostname property to devserver BUG=None TEST=None !Change-Id: I7fcd9b92d3c086ea9a8e6a4749f65b65a827855f [autotest] Extract get_hostname() function BUG=None TEST=None !Change-Id: I45f7a8e4f3f57beb77df6766fbe5747ebe295613 [autotest] Replace get_server_name with get_hostname BUG=None TEST=None !Change-Id: I75ebfe05ccd1f4d9209d68bc0e5f2db691558a74 [autotest] Add _reverse_lookup_from_config() BUG=chromium:666022 TEST=None !Change-Id: I1ea54296cc5a7a67981338c1c3d4057b065fa279 [autotest] Attempt to look up devserver hostname for metrics BUG=chromium:666022 TEST=None !Change-Id: I3dec24d4874de66466a373c97de5364c4b1ba557 [autotest] Make get_section_as_dict() ordered The ordering information is preserved in the config file, so may as well preserve it here. BUG=chromium:666022 TEST=None !Change-Id: I46b9fa47fa87b789a4e63563797a4327ac308bef [autotest] Clarify _reverse_lookup behavior for duplicates BUG=chromium:666022 TEST=None !Change-Id: I839ba7b55005b6137fa03887854ea59dfee49dfa Change-Id: I0aeb05d16d8fc8b98987dc232da8928ddd9fdb9f Reviewed-on: https://chromium-review.googlesource.com/424913 Commit-Ready: Allen Li <ayatane@chromium.org> Tested-by: Allen Li <ayatane@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org>
diff --git a/server/cros/telemetry_runner.py b/server/cros/telemetry_runner.py index 69529fd..806df91 100644 --- a/server/cros/telemetry_runner.py +++ b/server/cros/telemetry_runner.py
@@ -209,8 +209,7 @@ """ telemetry_cmd = [] if self._devserver: - devserver_hostname = dev_server.DevServer.get_server_name( - self._devserver.url()) + devserver_hostname = self._devserver.hostname telemetry_cmd.extend(['ssh', devserver_hostname]) if self._telemetry_on_dut: @@ -250,8 +249,7 @@ devserver_hostname = '' if perf_results_dir: if self._devserver: - devserver_hostname = dev_server.DevServer.get_server_name( - self._devserver.url()) + ':' + devserver_hostname = self._devserver.hostname + ':' if self._telemetry_on_dut: src = ('root@%s:%s/results-chart.json' % (self._host.hostname, DUT_CHROME_ROOT))