aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/rally/rally.py
diff options
context:
space:
mode:
Diffstat (limited to 'functest/opnfv_tests/openstack/rally/rally.py')
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index de553116..f984c368 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -94,11 +94,8 @@ class RallyBase(testcase_base.TestcaseBase):
else:
task_args['netid'] = ''
- auth_url = CONST.OS_AUTH_URL
- if auth_url is not None:
- task_args['request_url'] = auth_url.rsplit(":", 1)[0]
- else:
- task_args['request_url'] = ''
+ # get keystone auth endpoint
+ task_args['request_url'] = CONST.OS_AUTH_URL or ''
return task_args
@@ -533,10 +530,9 @@ class RallyBase(testcase_base.TestcaseBase):
return testcase_base.TestcaseBase.EX_RUN_ERROR
self.stop_time = time.time()
- if self.criteria == "PASS":
- return testcase_base.TestcaseBase.EX_OK
- else:
- return testcase_base.TestcaseBase.EX_TESTCASE_FAILED
+ # If we are here, it means that the test case was successfully executed
+ # criteria is managed by the criteria Field
+ return testcase_base.TestcaseBase.EX_OK
class RallySanity(RallyBase):