Merge remote branch 'cros/upstream' into tempbranch3

server/hosts/serial.py

 import os, sys, subprocess, logging
 
 from autotest_lib.client.common_lib import utils, error
 from autotest_lib.server import utils as server_utils
 from autotest_lib.server.hosts import remote
 
 
 SiteHost = utils.import_site_class(
     __file__, "autotest_lib.server.hosts.site_host", "SiteHost",
     remote.RemoteHost)
@@ skipping 96 matching lines @@
         if not self.conmux_attach or not os.path.exists(self.conmux_attach):
             return False
         cmd = '%s %s echo %s 2> /dev/null' % (self.conmux_attach,
                                               self.get_conmux_hostname(),
                                               cmd)
         result = utils.system(cmd, ignore_status=True)
         return result == 0
 
 
     def hardreset(self, timeout=DEFAULT_REBOOT_TIMEOUT, wait=True,
-                  conmux_command='hardreset', num_attempts=1,
+                  conmux_command='hardreset', num_attempts=1, halt=False,
                   **wait_for_restart_kwargs):
         """
         Reach out and slap the box in the power switch.
         @params conmux_command: The command to run via the conmux interface
         @params timeout: timelimit in seconds before the machine is
                          considered unreachable
         @params wait: Whether or not to wait for the machine to reboot
         @params num_attempts: Number of times to attempt hard reset erroring
                               on the last attempt.
+        @params halt: Halts the machine before hardresetting.
         @params **wait_for_restart_kwargs: keyword arguments passed to
                 wait_for_restart()
         """
         conmux_command = "'~$%s'" % conmux_command
 
         # if the machine is up, grab the old boot id, otherwise use a dummy
         # string and NOT None to ensure that wait_down always returns True,
         # even if the machine comes back up before it's called
         try:
             old_boot_id = self.get_boot_id()
         except error.AutoservSSHTimeout:
             old_boot_id = 'unknown boot_id prior to SerialHost.hardreset'
 
         def reboot():
+            if halt:
+                self.halt()
             if not self.run_conmux(conmux_command):
                 self.record("ABORT", None, "reboot.start",
                             "hard reset unavailable")
                 raise error.AutoservUnsupportedError(
                     'Hard reset unavailable')
             self.record("GOOD", None, "reboot.start", "hard reset")
             if wait:
                 warning_msg = ('Serial console failed to respond to hard reset '
                                'attempt (%s/%s)')
                 for attempt in xrange(num_attempts-1):
@@ skipping 20 matching lines @@
         if self.job:
             self.job.disable_warnings("POWER_FAILURE")
         try:
             if wait:
                 self.log_reboot(reboot)
             else:
                 reboot()
         finally:
             if self.job:
                 self.job.enable_warnings("POWER_FAILURE")