commit 2a5808cb73dbb4980ca4146967254565dc6df59d
author Jay Kim <yongjaek@chromium.org> Tue Oct 09 19:40:25 2012 -0700
committer Jay Kim <yongjaek@chromium.org> Tue Oct 23 13:04:44 2012 -0700
tree 362d1d62c3b92aef1c01f37ebef1a321c32a3df0
parent 0963d882f5fbf6f24dfbe13974682649f32db76b

Revert "Add the ability to HaltStep to execute cold_reboot command before actually halt."

This reverts commit 0963d882f5fbf6f24dfbe13974682649f32db76b

Change-Id: I053a31db8faaa8d57ac5ecaf092c4aa89a70a6bf
Reviewed-on: https://gerrit.chromium.org/gerrit/35089
Reviewed-by: Jay Kim <yongjaek@chromium.org>
Tested-by: Jay Kim <yongjaek@chromium.org>

client/cros/factory/__init__.py

diff --git a/client/cros/factory/__init__.py b/client/cros/factory/__init__.py
index 725eb39..a67b724 100644
--- a/client/cros/factory/__init__.py
+++ b/client/cros/factory/__init__.py
@@ -741,9 +741,6 @@
 class HaltStep(ShutdownStep):
     '''Halts the machine.'''
     def __init__(self, **kw):
-        if 'cold_reboot' in kw:
-            self.cold_reboot = kw['cold_reboot']
-            kw.pop('cold_reboot')
         super(HaltStep, self).__init__(operation=ShutdownStep.HALT, **kw)
 
 

client/cros/factory/goofy.py

diff --git a/client/cros/factory/goofy.py b/client/cros/factory/goofy.py
index 4e9dda1..9b7c46c 100755
--- a/client/cros/factory/goofy.py
+++ b/client/cros/factory/goofy.py
@@ -528,8 +528,6 @@
 
                 with self.env.lock:
                     self.event_log.Log('shutdown', operation=test.operation)
-                    if hasattr(test, 'cold_reboot'):
-                        subprocess.check_call(test.cold_reboot)
                     shutdown_result = self.env.shutdown(test.operation)
                 if shutdown_result:
                     # That's all, folks!