summaryrefslogtreecommitdiffstats
path: root/TestUnits
diff options
context:
space:
mode:
authorShwetha-H-Panduranga <shwetha@gluster.com>2011-12-27 17:55:03 +0530
committerShwetha-H-Panduranga <shwetha@gluster.com>2011-12-27 17:58:34 +0530
commit85fd40272633d7d4f5e142ac4b73d8f0ac3663db (patch)
treef36d86e814b1ea8fd2ac3a01adb76836e2ea6c6c /TestUnits
parent2b78067cde5ab3406edbdfb2677d7eb7f2f70f76 (diff)
return 'output' dictionary from serverutils.execute_on_brick and clientutils.execute_on_mount. This is to help the scripts for matching output expressions after the execution of command. Reflecting the same changes in cli/volume/top/testcases
Change-Id: I5ce9d0141f6171dad2d3a17512f0264b9af5beb3 Signed-off-by: Shwetha-H-Panduranga <shwetha@gluster.com>
Diffstat (limited to 'TestUnits')
-rw-r--r--TestUnits/cli/volume/top/testcases.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/TestUnits/cli/volume/top/testcases.py b/TestUnits/cli/volume/top/testcases.py
index 99775b5..182f29d 100644
--- a/TestUnits/cli/volume/top/testcases.py
+++ b/TestUnits/cli/volume/top/testcases.py
@@ -155,9 +155,9 @@ def bug2725a():
commands.append("echo 'Hello World' > " + dir_name)
commands.append("find . | xargs touch")
for command in commands:
- return_status = clientutils.execute_on_mount("mount1", command)
- if return_status:
- return return_status
+ output = clientutils.execute_on_mount("mount1", command)
+ if output["exitstatus"]:
+ return 1
command = "gluster volume top <volume1.volumename> open"
expected_output = ""
@@ -178,9 +178,9 @@ def bug2725b():
commands.append("echo 'Hello World' > " + dir_name)
commands.append("find . | xargs touch")
for command in commands:
- return_status = clientutils.execute_on_mount("mount1", command)
- if return_status:
- return return_status
+ output = clientutils.execute_on_mount("mount1", command)
+ if output["exitstatus"]:
+ return 1
commands = []
commands.append("gluster volume top <volume1.volumename> open")