Autotest upstream merge.
Merged from d9d64b855363d214996b187380532d4cc9991d29 to
7bad38846fe9c74e42018131ce85aec2b5e6c7a9
BUG=none
TEST=emerge autotest, run bvt, smoke.
Change-Id: Ibe6462198e84e0d41fa160af086283cd712da4a6
Reviewed-on: http://gerrit.chromium.org/gerrit/7440
Tested-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
diff --git a/client/common_lib/error.py b/client/common_lib/error.py
index 0c5641c..1823143 100644
--- a/client/common_lib/error.py
+++ b/client/common_lib/error.py
@@ -311,6 +311,7 @@
"""This exception is raised when an autotest test exceeds the timeout
parameter passed to run_timed_test and is killed.
"""
+ pass
class HostRunErrorMixIn(Exception):
@@ -329,6 +330,14 @@
return self.description + '\n' + repr(self.result_obj)
+class HostInstallTimeoutError(JobError):
+ """
+ Indicates the machine failed to be installed after the predetermined
+ timeout.
+ """
+ pass
+
+
class AutotestHostRunError(HostRunErrorMixIn, AutotestError):
pass