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 --- libs/utils/atfutils.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'libs/utils/atfutils.py') 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) -- cgit