diff options
author | Cedric Ollivier <ollivier.cedric@gmail.com> | 2017-03-28 08:12:15 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-03-28 08:12:15 +0000 |
commit | 514c97b036cf968e03e600a4761757448bef0a0a (patch) | |
tree | 1c26ce72ed668b8e183da925d7b5bced89445e22 /functest/opnfv_tests/openstack/refstack_client/refstack_client.py | |
parent | 5af67bcca589c275b73fe5e4bca9bea5871948aa (diff) | |
parent | 407d27585f109e3381bb49041abc49a14b7b5bfe (diff) |
Merge "Switch TestcaseBase to TestCase"
Diffstat (limited to 'functest/opnfv_tests/openstack/refstack_client/refstack_client.py')
-rwxr-xr-x | functest/opnfv_tests/openstack/refstack_client/refstack_client.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py index 4312b7f9..420c4ff9 100755 --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -23,7 +23,7 @@ import functest.utils.functest_utils as ft_utils logger = ft_logger.Logger("refstack_defcore").getLogger() -class RefstackClient(testcase_base.TestcaseBase): +class RefstackClient(testcase_base.TestCase): def __init__(self): super(RefstackClient, self).__init__() @@ -150,10 +150,10 @@ class RefstackClient(testcase_base.TestcaseBase): conf_utils.configure_tempest_defcore( self.DEPLOYMENT_DIR, img_flavor_dict) self.source_venv() - res = testcase_base.TestcaseBase.EX_OK + res = testcase_base.TestCase.EX_OK except KeyError as e: logger.error("defcore prepare env error with: %s", e) - res = testcase_base.TestcaseBase.EX_RUN_ERROR + res = testcase_base.TestCase.EX_RUN_ERROR return res @@ -167,10 +167,10 @@ class RefstackClient(testcase_base.TestcaseBase): self.defcore_env_prepare() self.run_defcore_default() self.parse_refstack_result() - res = testcase_base.TestcaseBase.EX_OK + res = testcase_base.TestCase.EX_OK except Exception as e: logger.error('Error with run: %s', e) - res = testcase_base.TestcaseBase.EX_RUN_ERROR + res = testcase_base.TestCase.EX_RUN_ERROR self.stop_time = time.time() return res @@ -187,15 +187,15 @@ class RefstackClient(testcase_base.TestcaseBase): openstack_utils.source_credentials(CONST.openstack_creds) self.defcore_env_prepare() self.run_defcore(tempestconf, testlist) - res = testcase_base.TestcaseBase.EX_OK + res = testcase_base.TestCase.EX_OK except Exception as e: logger.error('Error with run: %s', e) - res = testcase_base.TestcaseBase.EX_RUN_ERROR + res = testcase_base.TestCase.EX_RUN_ERROR return res -class RefstackClientParser(testcase_base.TestcaseBase): +class RefstackClientParser(testcase_base.TestCase): def __init__(self): super(RefstackClientParser, self).__init__() @@ -228,7 +228,7 @@ if __name__ == '__main__': args = parser.parse_args(sys.argv[1:]) try: result = refstackclient.main(**args) - if result != testcase_base.TestcaseBase.EX_OK: + if result != testcase_base.TestCase.EX_OK: sys.exit(result) except Exception: - sys.exit(testcase_base.TestcaseBase.EX_RUN_ERROR) + sys.exit(testcase_base.TestCase.EX_RUN_ERROR) |