Merge remote branch 'cros/upstream' into master

server/hosts/remote.py

 """This class defines the Remote host class, mixing in the SiteHost class
 if it is available."""
 
 import os, logging, urllib
 from autotest_lib.client.common_lib import error
 from autotest_lib.server import utils
 from autotest_lib.server.hosts import base_classes, bootloader
 
 
 class RemoteHost(base_classes.Host):
     """
     This class represents a remote machine on which you can run
     programs.
 
     It may be accessed through a network, a serial line, ...
     It is not the machine autoserv is running on.
 
     Implementation details:
     This is an abstract class, leaf subclasses must implement the methods
     listed here and in parent classes which have no implementation. They
     may reimplement methods which already have an implementation. You
     must not instantiate this class but should instantiate one of those
     leaf subclasses.
     """
 
     DEFAULT_REBOOT_TIMEOUT = base_classes.Host.DEFAULT_REBOOT_TIMEOUT
     LAST_BOOT_TAG = object()
     DEFAULT_HALT_TIMEOUT = 2 * 60
 
-    VAR_LOG_MESSAGES_COPY_PATH = "/var/log/messages.autotest_start"
+    VAR_LOG_MESSAGES_COPY_PATH = "/var/tmp/messages.autotest_start"
 
     def _initialize(self, hostname, autodir=None, *args, **dargs):
         super(RemoteHost, self)._initialize(*args, **dargs)
 
         self.hostname = hostname
         self.autodir = autodir
         self.tmp_dirs = []
 
 
     def __repr__(self):
@@ skipping 182 matching lines @@
     def get_all_labels(self):
         """
         Return all labels, or empty list if label is not set.
         """
         if self.job:
             keyval_path = os.path.join(self.job.resultdir, 'host_keyvals',
                                        self.hostname)
             keyvals = utils.read_keyval(keyval_path)
             all_labels = keyvals.get('labels', '')
             if all_labels:
-              all_labels = all_labels.split(',')
-              return [urllib.unquote(label) for label in all_labels]
+                all_labels = all_labels.split(',')
+                return [urllib.unquote(label) for label in all_labels]
         return []
 
 
     def delete_tmp_dir(self, tmpdir):
         """
         Delete the given temporary directory on the remote machine.
         """
         self.run('rm -rf "%s"' % utils.sh_escape(tmpdir), ignore_status=True)
         self.tmp_dirs.remove(tmpdir)
 
@@ skipping 18 matching lines @@
         """
         processes = self.get_wait_up_processes()
         if len(processes) == 0:
             return True # wait up processes aren't being used
         for procname in processes:
             exit_status = self.run("{ ps -e || ps; } | grep '%s'" % procname,
                                    ignore_status=True).exit_status
             if exit_status == 0:
                 return True
         return False