commit d99d3b27fb076377354fa388e0a81e97bda443b8
author mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> Mon Dec 22 14:41:27 2008 +0000
committer mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> Mon Dec 22 14:41:27 2008 +0000
tree e650665bed522bf0232465693fa7e9bf4daa9e7d
parent 5280e3b7bf6c6809f83bf8b3ae4b47cf65bd86a1

Boot timeout leads to hardreset attempt, then broken exception.
Exception handler on _wait_for_reboot's attempted call on optional hardreset routine
was not catching the kind of exception thrown when host has no hard reset op.

Signed-off-by: Duane Sand <duanes@google.com>




git-svn-id: http://test.kernel.org/svn/autotest/trunk@2577 592f7852-d20e-0410-864c-8624ca9c26a4

server/autotest.py

diff --git a/server/autotest.py b/server/autotest.py
index c8d6e47..9daf188 100644
--- a/server/autotest.py
+++ b/server/autotest.py
@@ -452,7 +452,7 @@
             self.logger.warning(warning)
             try:
                 self.host.hardreset(wait=False)
-            except error.AutoservUnsupportedError:
+            except (AttributeError, error.AutoservUnsupportedError):
                 warning = "Hard reset unsupported on %s"
                 warning %= self.host.hostname
                 self.logger.warning(warning)