Index: client/tests/kvm/tests/multicast.py |
diff --git a/client/tests/kvm/tests/multicast.py b/client/tests/kvm/tests/multicast.py |
index 2a12b4f069c0870041c65e29abff612d29a6c177..a47779a78279117e1d4e43647e6e86df90a9820d 100644 |
--- a/client/tests/kvm/tests/multicast.py |
+++ b/client/tests/kvm/tests/multicast.py |
@@ -1,7 +1,7 @@ |
import logging, os, re |
from autotest_lib.client.common_lib import error |
from autotest_lib.client.bin import utils |
-import kvm_test_utils, kvm_subprocess |
+import kvm_test_utils |
def run_multicast(test, params, env): |
@@ -23,10 +23,10 @@ def run_multicast(test, params, env): |
timeout=int(params.get("login_timeout", 360))) |
def run_guest(cmd): |
- try: |
- session.cmd(cmd) |
- except kvm_subprocess.ShellError, e: |
- logging.warn(e) |
+ s, o = session.get_command_status_output(cmd) |
+ if s: |
+ logging.warning('Command %s executed in guest returned exit code ' |
+ '%s, output: %s', cmd, s, o.strip()) |
def run_host_guest(cmd): |
run_guest(cmd) |
@@ -56,8 +56,8 @@ def run_multicast(test, params, env): |
mcast_path = os.path.join(test.bindir, "scripts/join_mcast.py") |
if not vm.copy_files_to(mcast_path, "/tmp"): |
raise error.TestError("Fail to copy %s to guest" % mcast_path) |
- output = session.cmd_output("python /tmp/join_mcast.py %d %s %d" % |
- (mgroup_count, prefix, suffix)) |
+ output = session.get_command_output("python /tmp/join_mcast.py %d %s %d" % |
+ (mgroup_count, prefix, suffix)) |
# if success to join multicast, the process will be paused, and return PID. |
try: |
@@ -86,6 +86,6 @@ def run_multicast(test, params, env): |
(s, o)) |
finally: |
- logging.debug(session.cmd_output("ipmaddr show")) |
- session.cmd_output("kill -s SIGCONT %s" % pid) |
+ logging.debug(session.get_command_output("ipmaddr show")) |
+ session.get_command_output("kill -s SIGCONT %s" % pid) |
session.close() |