summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShwetha-H-Panduranga <shwetha@gluster.com>2012-03-05 16:44:50 +0530
committerShwetha-H-Panduranga <shwetha@gluster.com>2012-03-05 16:45:00 +0530
commit0c9076add5f357b4278c4720c37518280a13e43e (patch)
tree31c9c18566d86ee3ac20bf35c6841510dbea92bb
parent9eec965620e1e66e34567e989e58c9df23476cbc (diff)
Modifying the testcases to reflect the changes made to the return value from the libraries
Change-Id: I07fa848828ae191c9728c856494a161cbb413559 Signed-off-by: Shwetha-H-Panduranga <shwetha@gluster.com>
-rw-r--r--TestUnits/cli/volume/top/testcases.py243
-rw-r--r--TestUnits/cli/volume/top/testcaseslist5
-rw-r--r--TestUnits/cli/volume/top/testunit.py75
3 files changed, 199 insertions, 124 deletions
diff --git a/TestUnits/cli/volume/top/testcases.py b/TestUnits/cli/volume/top/testcases.py
index 182f29d..5fea54c 100644
--- a/TestUnits/cli/volume/top/testcases.py
+++ b/TestUnits/cli/volume/top/testcases.py
@@ -11,9 +11,11 @@ import atfutils
volume_top_usage = "Usage: volume top <VOLNAME> {[open|read|write|opendir|readdir] |[read-perf|write-perf bs <size> count <count>]} [brick <brick>] [list-cnt <count>]"
def reset_testenv():
- return_status = 1
- if clientutils.umountall():
- return return_status
+ output = clientutils.umountall()
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
+
glusterutils.volume_stop("server1", force=True)
glusterutils.volume_delete("server1")
glusterutils.glusterd_stop_allservers()
@@ -24,146 +26,217 @@ def reset_testenv():
def setup_testenv():
"""
"""
- return_status = 1
- if glusterutils.glusterd_start_allservers(force=True):
- return return_status
- if glusterutils.peer_probe("server1"):
- return return_status
- if glusterutils.create_brick_allservers():
- return return_status
- if glusterutils.volume_create("server1"):
- return return_status
- if glusterutils.volume_start("server1"):
- return return_status
- if clientutils.mount("mount1"):
- return return_status
- return 0
+ output = glusterutils.glusterd_start_allservers(force=True)
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
+
+ output = glusterutils.peer_probe("server1")
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
+
+ output = glusterutils.create_brick_allservers()
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
+
+ output = glusterutils.volume_create("server1")
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
+
+ output = glusterutils.volume_start("server1")
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
+
+ output = clientutils.mount("mount1")
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
-def validate_output(output, expected_exit_status, expected_output):
- """
- """
- if expected_exit_status is 1:
- exit_status = atfutils.assert_failure(output['exitstatus'])
- else:
- exit_status = atfutils.assert_success(output['exitstatus'])
-
- output_status = atfutils.expect(str(output['stdoutdata']),
- expected_output)
- if output_status is True and (not exit_status):
- return 0
- else:
- return 1
+ return 0
def bug2645a():
"""
"""
- command = "gluster volume top <volume1.volumename> write-perf bs 0 count 100"
+ operation = "write-perf bs 0 count 100"
expected_output = "block size should be an integer greater than zero"
- expected_exit_status = 1
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ expected_exit_status = 1
+ output = glusterutils.volume_top("server1", operation)
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2645b():
"""
"""
- command = "gluster volume top <volume1.volumename> write-perf bs 1024 count 0"
+ operation = "write-perf bs 1024 count 0"
expected_output = "count should be an integer greater than zero"
expected_exit_status = 1
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ output = glusterutils.volume_top("server1", operation)
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2645c():
"""
"""
- command = "gluster volume top <volume1.volumename> write-perf bs 1024 count 100"
+ operation = "write-perf bs 1024 count 100"
expected_output = ""
expected_exit_status = 0
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ output = glusterutils.volume_top("server1", operation)
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2771a():
"""
"""
- command = "gluster volume top <volume1.volumename> write-perf list-cnt 10 brick <brick1.hostname>:<brick1.path> bs 2048"
+ operation = "write-perf bs 2048"
expected_output = volume_top_usage
expected_exit_status = 1
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ output = glusterutils.volume_top("server1", operation, brick="brick1",
+ list_cnt="10")
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2771b():
"""
"""
- command = "gluster volume top <volume1.volumename> read-perf list-cnt 99 bs 37 brick <brick1.hostname>:<brick1.path>"
+ operation = "read-perf bs 37"
expected_output = volume_top_usage
expected_exit_status = 1
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ output = glusterutils.volume_top("server1", operation, brick="brick1",
+ list_cnt="99")
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2771c():
"""
"""
- command = "gluster volume top <volume1.volumename> read-perf list-cnt 99 bs 37 brick <brick1.hostname>:<brick1.path> bs 1024"
+ operation = "read-perf bs 37 bs 1024"
expected_output = volume_top_usage
expected_exit_status = 1
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ output = glusterutils.volume_top("server1", operation, brick="brick1",
+ list_cnt="99")
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2771d():
"""
"""
- command = "gluster volume top <volume1.volumename> read-perf list-cnt 99 count 37 brick <brick1.hostname>:<brick1.path> count 10"
+ operation = "read-perf count 37 count 10"
expected_output = volume_top_usage
expected_exit_status = 1
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ output = glusterutils.volume_top("server1", operation, brick="brick1",
+ list_cnt="99")
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2771e():
- command = "gluster volume top <volume1.volumename> read-perf bs 1024 count 37 brick <brick1.hostname>:<brick1.path> list-cnt 10"
+ operation = "read-perf bs 1024 count 37"
expected_output = ""
expected_exit_status = 0
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ output = glusterutils.volume_top("server1", operation, brick="brick1",
+ list_cnt="10")
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2771f():
"""
"""
- command = "gluster volume top <volume1.volumename> read-perf list-cnt 10 count 37 brick <brick1.hostname>:<brick1.path> bs 1024"
+ operation = "read-perf count 37 bs 1024"
expected_output = ""
expected_exit_status = 0
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+
+ output = glusterutils.volume_top("server1", operation, brick="brick1",
+ list_cnt="10")
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ return 0
def bug2725a():
"""
"""
+ testcase_failed = False
dir_name = 'a'
for i in range(1, 255):
dir_name += 'a'
- pass
commands = []
commands.append("echo 'Hello World' > " + dir_name)
commands.append("find . | xargs touch")
for command in commands:
output = clientutils.execute_on_mount("mount1", command)
- if output["exitstatus"]:
- return 1
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
- command = "gluster volume top <volume1.volumename> open"
+ operation = "write-perf bs 2048 count 1000"
expected_output = ""
expected_exit_status = 0
- output = hostutils.execute_command("server1", command)
- return validate_output(output, expected_exit_status, expected_output)
+ output = glusterutils.volume_top("server1", operation, list_cnt="100")
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ operations = ['open', 'read', 'write']
+ for operation in operations:
+ output = glusterutils.volume_top("server1", operation)
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ testcase_failed = True
+
+ if testcase_failed is True:
+ return 1
+ else:
+ return 0
def bug2725b():
"""
@@ -172,40 +245,34 @@ def bug2725b():
dir_name = 'a'
for i in range(1, 255):
dir_name += 'a'
- pass
commands = []
commands.append("echo 'Hello World' > " + dir_name)
commands.append("find . | xargs touch")
for command in commands:
output = clientutils.execute_on_mount("mount1", command)
- if output["exitstatus"]:
- return 1
+ assert_success_status = atfutils.assert_success(output["exitstatus"])
+ if assert_success_status is not 0:
+ return assert_success_status
- commands = []
- commands.append("gluster volume top <volume1.volumename> open")
- commands.append("gluster volume top <volume1.volumename> read")
- commands.append("gluster volume top <volume1.volumename> write-perf bs 2048 count 1000 list-cnt 100")
+ operation = "write-perf bs 2048 count 1000"
expected_output = "Unable to decode response"
expected_exit_status = 1
- for command in commands:
- output = hostutils.execute_command("server1", command)
- return_status = validate_output(output, expected_exit_status, expected_output)
- if return_status:
+ output = glusterutils.volume_top("server1", operation, list_cnt="100")
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
+ return return_status
+
+ operations = ['open', 'read', 'write']
+ for operation in operations:
+ output = glusterutils.volume_top("server1", operation)
+ return_status = atfutils.validate_output(output, expected_exit_status,
+ expected_output)
+ if return_status is not 0:
testcase_failed = True
- if testcase_failed:
+ if testcase_failed is True:
return 1
else:
return 0
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TestUnits/cli/volume/top/testcaseslist b/TestUnits/cli/volume/top/testcaseslist
index a8eaf4a..fb570a1 100644
--- a/TestUnits/cli/volume/top/testcaseslist
+++ b/TestUnits/cli/volume/top/testcaseslist
@@ -13,8 +13,3 @@ bug2771e : >= 3 : art
bug2771f : >= 3 : art
bug2725a : >= 3.3 : art
bug2725b : 3.2 - 3.2.5 : art
-
-
-
-
-
diff --git a/TestUnits/cli/volume/top/testunit.py b/TestUnits/cli/volume/top/testunit.py
index f0f6b5d..6edf3b4 100644
--- a/TestUnits/cli/volume/top/testunit.py
+++ b/TestUnits/cli/volume/top/testunit.py
@@ -17,40 +17,42 @@ def initialize():
"""
"""
logger = GlobalObj.getLoggerObj()
- return_status = 1
testenv_file = GlobalObj.testenv_file
testenv_abspath = os.path.join(dir_path, testenv_file)
if not (os.path.isfile(testenv_abspath)):
logger.error("%s not found in %s" % (testenv_file, dir_path))
-
- if parser.parse_testenv_configfile(testenv_abspath):
+
+ return_status = parser.parse_testenv_configfile(testenv_abspath)
+ if return_status is not 0:
return return_status
- if managerutils.ssh_connect_allhosts():
+
+ return_status = managerutils.ssh_connect_allhosts()
+ if return_status is not 0:
return return_status
-
+
return 0
def setup():
"""
"""
- return_status = 1
- if atfutils.set_active_volume("volume1"):
+ return_status = atfutils.set_active_volume("volume1")
+ if return_status is not 0:
return return_status
+
return 0
def execute():
"""
"""
logger = GlobalObj.getLoggerObj()
- return_status = 1
testcaseslist_file = GlobalObj.testcaseslist_file
testcaseslist_abspath = os.path.join(dir_path, testcaseslist_file)
-
+
if not (os.path.isfile(testcaseslist_abspath)):
logger.error("%s not found in %s" % (testcaseslist_file, dir_path))
- return return_status
-
+ return 1
+
else:
testcaseslist = []
testcaseslist = parser.parse_testcaseslist_file(testcaseslist_abspath)
@@ -62,27 +64,32 @@ def execute():
passedtestcases = 0
failedtestcases = 0
selectedtestcases = len(testcaseslist)
-
+
logger.info("Starting TestUnit: '%s' test execution" % dir_path)
- testcases.reset_testenv()
- testcases.setup_testenv()
+
+ return_status = testcases.reset_testenv()
+ if return_status is not 0:
+ return return_status
+
+ return_status = testcases.setup_testenv()
+ if return_status is not 0:
+ return return_status
+
for testcase in testcaseslist:
function_obj = getattr(testcases, testcase)
if function_obj:
- logger.debug("Starting Test: ' %s '" % testcase)
+ logger.info("Starting Test: %s" % testcase)
return_status = function_obj()
- if return_status:
- logger.debug("TestCase '%s' Failed" % testcase)
- failedtestcases +=1
+ if return_status is not 0:
+ logger.info("TestCase %s Failed" % testcase)
+ failedtestcases += 1
else:
- logger.debug("TestCase '%s' Passed" % testcase)
- passedtestcases +=1
- logger.debug("Ending Test: '%s'" % testcase)
+ logger.info("TestCase %s Passed" % testcase)
+ passedtestcases += 1
+ logger.info("Ending Test: %s" % testcase)
else:
logger.info("TestCase %s not defined in 'testcases' module"
% testcase)
- continue
-
logger.info("Selected %d : Passed %d, Failed %d"
% (selectedtestcases,
@@ -90,25 +97,31 @@ def execute():
failedtestcases))
logger.info("Ending TestUnit: '%s' test execution" % dir_path)
-
+
return 0
def cleanup():
"""
"""
pass
-
+
def main():
"""
"""
- return_status = 1
- if initialize():
+ return_status = initialize()
+ if return_status is not 0:
return return_status
- if setup():
+
+ return_status = setup()
+ if return_status is not 0:
return return_status
- if execute():
+
+ return_status = execute()
+ if return_status is not 0:
return return_status
- if cleanup():
+
+ return_status = cleanup()
+ if return_status is not 0:
return return_status
-
+
return 0