summaryrefslogtreecommitdiffstats
path: root/libs/utils/atfutils.py
diff options
context:
space:
mode:
authorShwetha-H-Panduranga <shwetha@gluster.com>2011-12-21 14:34:54 +0530
committerShwetha-H-Panduranga <shwetha@gluster.com>2011-12-21 14:34:54 +0530
commitb97aeef60a55a99dc90d21ff2a2e236fa7f96086 (patch)
treef873e42af84bc62b28c331a21beb3951f4b89d93 /libs/utils/atfutils.py
parent50fd16aa865a7230100b71aec0fbbbf767f4652a (diff)
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
Diffstat (limited to 'libs/utils/atfutils.py')
-rw-r--r--libs/utils/atfutils.py22
1 files changed, 14 insertions, 8 deletions
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)