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/tests/btreplay/btreplay.py b/client/tests/btreplay/btreplay.py
index de4bb03..04e1017 100644
--- a/client/tests/btreplay/btreplay.py
+++ b/client/tests/btreplay/btreplay.py
@@ -53,7 +53,7 @@
# wait until blktrace is really done
slept = 0.0
while system("ps -C blktrace > /dev/null",
- ignorestatus=True) == 0:
+ ignore_status=True) == 0:
time.sleep(0.1)
slept += 0.1
if slept > 30.0:
diff --git a/client/tests/kvmtest/kvmtest.py b/client/tests/kvmtest/kvmtest.py
index 9d47a93..5bbf91d 100644
--- a/client/tests/kvmtest/kvmtest.py
+++ b/client/tests/kvmtest/kvmtest.py
@@ -66,7 +66,7 @@
print("Summary: Passed %d Failed %d" %(passed, failed))
# if we had any tests not passed, fail entire test
if failed != 0:
- raise CmdError('kvm-test-replay', 1)
+ raise TestError('kvm-test-replay')
def __get_expected_file(self, logfile):
diff --git a/client/tests/netperf2/netperf2.py b/client/tests/netperf2/netperf2.py
index a0ae608..65e5cdd 100755
--- a/client/tests/netperf2/netperf2.py
+++ b/client/tests/netperf2/netperf2.py
@@ -52,7 +52,7 @@
# we should really record the pid we forked off, but there
# was no obvious way to run the daemon in the foreground.
# Hacked it for now
- system('killall netserver', ignorestatus=1)
+ system('killall netserver', ignore_status=True)
system(self.server_path)