Merge remote branch 'autotest-upstream/master' into autotest-merge

scheduler/drones.py

 import cPickle, os, tempfile, logging
 import common
 from autotest_lib.scheduler import drone_utility, email_manager
 from autotest_lib.client.common_lib import error, global_config
 
 
 AUTOTEST_INSTALL_DIR = global_config.global_config.get_config_value('SCHEDULER',
                                                  'drone_installation_directory')
 
 class DroneUnreachable(Exception):
@@ skipping 104 matching lines @@
     def __init__(self, hostname):
         super(_RemoteDrone, self).__init__()
         self.hostname = hostname
         self._host = drone_utility.create_host(hostname)
         if not self._host.is_up():
             logging.error('Drone %s is unpingable, kicking out', hostname)
             raise DroneUnreachable
         self._autotest_install_dir = AUTOTEST_INSTALL_DIR
 
 
+    @property
+    def _drone_utility_path(self):
+        return os.path.join(self._autotest_install_dir,
+                            'scheduler', 'drone_utility.py')
+
+
     def set_autotest_install_dir(self, path):
         self._autotest_install_dir = path
 
 
     def shutdown(self):
         super(_RemoteDrone, self).shutdown()
         self._host.close()
 
 
     def _execute_calls_impl(self, calls):
         logging.info("Running drone_utility on %s", self.hostname)
-        drone_utility_path = os.path.join(self._autotest_install_dir,
-                                          'scheduler', 'drone_utility.py')
-        result = self._host.run('python %s' % drone_utility_path,
-                                stdin=cPickle.dumps(calls), connect_timeout=300)
-
+        result = self._host.run('python %s' % self._drone_utility_path,
+                                stdin=cPickle.dumps(calls), stdout_tee=None,
+                                connect_timeout=300)
         try:
             return cPickle.loads(result.stdout)
         except Exception: # cPickle.loads can throw all kinds of exceptions
             logging.critical('Invalid response:\n---\n%s\n---', result.stdout)
             raise
 
 
     def send_file_to(self, drone, source_path, destination_path,
                      can_fail=False):
         if drone.hostname == self.hostname:
@@ skipping 10 matching lines @@
 def get_drone(hostname):
     """
     Use this factory method to get drone objects.
     """
     if hostname == 'localhost':
         return _LocalDrone()
     try:
         return _RemoteDrone(hostname)
     except DroneUnreachable:
         return None