From b97aeef60a55a99dc90d21ff2a2e236fa7f96086 Mon Sep 17 00:00:00 2001 From: Shwetha-H-Panduranga Date: Wed, 21 Dec 2011 14:34:54 +0530 Subject: Changing the function assert_success and assert_failure in atfutils to take exit_status as argument. Hence refelecting the changes in all files which used the functions --- TestUnits/cli/volume/top/testcases.py | 4 ++-- libs/utils/atfutils.py | 22 ++++++++++++-------- libs/utils/clientutils.py | 8 ++++---- libs/utils/glusterutils.py | 38 +++++++++++++++++------------------ libs/utils/hostutils.py | 8 ++++---- 5 files changed, 43 insertions(+), 37 deletions(-) diff --git a/TestUnits/cli/volume/top/testcases.py b/TestUnits/cli/volume/top/testcases.py index 8a8a289..6ba55e6 100644 --- a/TestUnits/cli/volume/top/testcases.py +++ b/TestUnits/cli/volume/top/testcases.py @@ -44,9 +44,9 @@ def validate_output(output, expected_exit_status, expected_output): """ """ if expected_exit_status is 1: - exit_status = atfutils.assert_failure(**output) + exit_status = atfutils.assert_failure(output['exitstatus']) else: - exit_status = atfutils.assert_success(**output) + exit_status = atfutils.assert_success(output['exitstatus']) output_status = atfutils.expect(str(output['stdoutdata']), expected_output) diff --git a/libs/utils/atfutils.py b/libs/utils/atfutils.py index b19ef38..b1f774e 100644 --- a/libs/utils/atfutils.py +++ b/libs/utils/atfutils.py @@ -11,18 +11,24 @@ import re import ssh from atfglobals import GlobalObj -def assert_success(**arguments): +def assert_success(exit_status): """ - """ - if not arguments["exitstatus"]: + """ + if exit_status is None: + return 1 + + if not exit_status: return 0 else: return 1 -def assert_failure(**arguments): +def assert_failure(exit_status): """ - """ - if arguments["exitstatus"]: + """ + if exit_status is None: + return 1 + + if exit_status: return 0 else: return 1 @@ -61,9 +67,9 @@ def validate_output(output, expected_exit_status, expected_output): expected_output """ if expected_exit_status is not 0: - exit_status = assert_failure(**output) + exit_status = assert_failure(output['exitstatus']) else: - exit_status = assert_success(**output) + exit_status = assert_success(output['exitstatus']) output_status = expect(str(output['stdoutdata']), expected_output) diff --git a/libs/utils/clientutils.py b/libs/utils/clientutils.py index 9272e55..9003c75 100644 --- a/libs/utils/clientutils.py +++ b/libs/utils/clientutils.py @@ -46,7 +46,7 @@ def umount(mountkey): command = ' '.join([base_command, mount_obj.dir]) logger.debug('%s: Executing Command: %s' % (clientkey, command)) output = client_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) if return_status: @@ -134,7 +134,7 @@ def mount(mountkey): logger.debug('%s: Executing Command: %s' % (clientkey, command)) output = client_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -207,7 +207,7 @@ __all__ = ['execute_on_mount', ## for mountpoint in mountpoints: ## command = base_command + mountpoint ## output = client.executecommand(command) -## return_code = utils.assert_success(**output) +## return_code = utils.assert_success(output['exitstatus']) ## if return_code: ## failure_flag = True ## else: @@ -229,7 +229,7 @@ __all__ = ['execute_on_mount', ## for mountpoint in mountpoints: ## command = base_command + mountpoint ## output = client.executecommand(command) -## return_code = utils.assert_success(**output) +## return_code = utils.assert_success(output['exitstatus']) ## if return_code: ## failure_flag = True ## else: diff --git a/libs/utils/glusterutils.py b/libs/utils/glusterutils.py index f55d260..afd5db0 100644 --- a/libs/utils/glusterutils.py +++ b/libs/utils/glusterutils.py @@ -45,7 +45,7 @@ def glusterd_start(serverkey, force=False): restart glusterd process""" command = commands_to_execute.pop() output = host_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) if not return_status: if force: return_status = glusterd_restart(serverkey) @@ -57,7 +57,7 @@ def glusterd_start(serverkey, force=False): output = host_connection.executecommand(command) if output["exitstatus"]: logger.error("Unable to start glusterd") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) return return_status else: if output["stdoutdata"]: @@ -65,7 +65,7 @@ def glusterd_start(serverkey, force=False): gluster_path = output["stdoutdata"][0].strip("\n") else: logger.error("Unable to find gluster path") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) return return_status if gluster_path: @@ -76,7 +76,7 @@ def glusterd_start(serverkey, force=False): logger.debug('%s: Executing Command: %s' %(serverkey, gluster_path)) output = host_connection.executecommand(gluster_path) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -114,7 +114,7 @@ def glusterd_stop(serverkey): gluster_pid_list = [] output = host_connection.executecommand("pidof glusterd") - return_status = atfutils.assert_failure(**output) + return_status = atfutils.assert_failure(output['exitstatus']) if not return_status: return return_status @@ -127,7 +127,7 @@ def glusterd_stop(serverkey): command = base_command + pid logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) if return_status: @@ -181,7 +181,7 @@ def glusterd_remove_dir(serverkey): command = ' '.join([base_command, glusterd_dir]) logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = server_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return 0 @@ -230,7 +230,7 @@ def glusterd_remove_logs(serverkey): command = ' '.join([base_command, path]) logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = server_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) @@ -268,7 +268,7 @@ def volume_delete(serverkey): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command, commandInput="y\n") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -309,7 +309,7 @@ def volume_create(serverkey): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command, commandInput="y\n") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) if return_status: if str(output["stdoutdata"]).rfind("already exists"): return_status = 0 @@ -341,7 +341,7 @@ def volume_start(serverkey, force=False): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command, commandInput="y\n") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) if return_status: if str(output["stdoutdata"]).rfind("already started"): return_status = 0 @@ -373,7 +373,7 @@ def volume_stop(serverkey, force=False): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command, commandInput="y\n") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -411,7 +411,7 @@ def volume_addbrick(serverkey, *bricks): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command, commandInput="y\n") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) if not return_status: if env.addBricksToVolume(*bricks): return 1 @@ -450,7 +450,7 @@ def volume_replacebrick(serverkey, brick, newbrick, operation): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command, commandInput="y\n") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) if not return_status: if env.replaceBrickInVolume(brick, newbrick): return 1 @@ -484,7 +484,7 @@ def volume_set(serverkey, key, value): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command, commandInput="y\n") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -510,7 +510,7 @@ def volume_reset(serverkey): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = host_connection.executecommand(command, commandInput="y\n") - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -543,7 +543,7 @@ def peer_probe(fromserverkey): logger.debug('%s: Executing Command: %s' % (fromserverkey, command)) output = host_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -611,7 +611,7 @@ def umount_device(serverkey, device): command = base_command + mountpoint logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = server_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) if return_status: @@ -650,7 +650,7 @@ def mount_exportdir(serverkey, device, fstype, options, dirpath): logger.debug('%s: Executing Command: %s' % (serverkey, command)) output = server_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status diff --git a/libs/utils/hostutils.py b/libs/utils/hostutils.py index 32741ea..e6f7189 100644 --- a/libs/utils/hostutils.py +++ b/libs/utils/hostutils.py @@ -31,7 +31,7 @@ def cd(hostkey, dirpath): command = ' '.join([base_command, dirpath]) logger.debug('%s: Executing Command: %s' % (hostkey, command)) output = host_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -56,7 +56,7 @@ def rmdir(hostkey, dirpath): command = ' '.join([base_command, dirpath]) logger.debug('%s: Executing Command: %s' % (hostkey, command)) output = host_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -82,7 +82,7 @@ def mkdir(hostkey, dirpath): command = ' '.join([base_command, dirpath]) logger.debug('%s: Executing Command: %s' % (hostkey, command)) output = host_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status @@ -110,7 +110,7 @@ def mkfs(hostkey, device, fstype=None): command = ' '.join(command) logger.debug('%s: Executing Command: %s' % (hostkey, command)) output = host_connection.executecommand(command) - return_status = atfutils.assert_success(**output) + return_status = atfutils.assert_success(output['exitstatus']) atfutils.print_stdout(output['stdoutdata']) atfutils.print_stderr(output['stderrdata']) return return_status -- cgit