commit 792e2071039158ec5709d9ab0c7c0bcac8fff6d3
author Alex Miller <milleral@chromium.org> Tue Feb 18 21:00:20 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Feb 19 18:35:58 2014 +0000
tree bd3fb23499de605b2a81aafc4bc6a797d3431802
parent fe39509eb7268619c2589cc42812a38197ac2111

[autotest] Minor bugfixes for host_object_runner.

We need to specify a non-root user and return only the stdout.

I also forgot to update instances->sam_instances from a nit on a
previous CL.

BUG=chromium:340454
TEST=ran on chromeos-mcp

Change-Id: I5bd5b42adc1250c2e7493d9cf3afeef42271e72e
Reviewed-on: https://chromium-review.googlesource.com/187060
Tested-by: Alex Miller <milleral@chromium.org>
Reviewed-by: Dan Shi <dshi@chromium.org>
Commit-Queue: Alex Miller <milleral@chromium.org>

site_utils/lib/infra.py

diff --git a/site_utils/lib/infra.py b/site_utils/lib/infra.py
index 571748c..9f4a8a5 100644
--- a/site_utils/lib/infra.py
+++ b/site_utils/lib/infra.py
@@ -36,7 +36,9 @@
     try:
         host_object = _host_objects[host]
     except KeyError:
-        host_object = ssh_host.SSHHost(host)
+        username = global_config.global_config.get_config_value(
+                'CROS', 'infrastructure_user')
+        host_object = ssh_host.SSHHost(host, user=username)
         _host_objects[host] = host_object
 
     def runner(cmd):
@@ -49,7 +51,7 @@
         @raises CalledProcessError: If there was a non-0 return code.
         """
         try:
-            return host_object.run(cmd)
+            return host_object.run(cmd).stdout
         except error.AutotestHostRunError as e:
             exit_status = e.result_obj.exit_status
             command = e.result_obj.command
@@ -127,7 +129,7 @@
     from the rest of the system.
     """
     sams_config = global_config.global_config.get_config_value(
-            'SERVER', 'instances', default='')
+            'SERVER', 'sam_instances', default='')
     sams = _csv_to_list(sams_config)
     return sams