1. Removed the system() and system_output() implementations from client/bin/autotest_utils.py so that the ones in common_lib/utils.py are used throughout.
2. Add an optional parameter to system_output() in client/common_lib/utils.py to retain stdout and not throw it away.
3. Renamed ignorestatus to ignore_status to make it consistent with the rest of the code.
4. Modified the tests to use the renamed ignore_status option
5. Modifed the CmdError() implementation in client/common_lib/error.py and made sure all the places on the server side, that expect a AutoservRunError exception are changed to expect and handle a CmdError exception instead.
Signed-off-by: Ashwin Ganti <aganti@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1499 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/common_lib/error.py b/client/common_lib/error.py
index b373ddb..645aa3f 100644
--- a/client/common_lib/error.py
+++ b/client/common_lib/error.py
@@ -43,12 +43,12 @@
"""\
Indicates that a command failed, is fatal to the test unless caught.
"""
- def __init__(self, command, result_code):
- TestError.__init__(self, command, result_code)
+ def __init__(self, command, result_obj):
+ TestError.__init__(self, command, result_obj)
def __str__(self):
- return "Command <" + self.args[0] + "> failed, rc=%d" % (self.args[1])
+ return "Command <" + self.args[0] + "> failed, rc=%d" % (self.args[1].exit_status)
class PackageError(TestError):
"""Indicates an error trying to perform a package operation."""