From 69e51470d8e9f51e02d5f0bd6e957c4e24c603c6 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 27 Mar 2017 10:26:05 +0200 Subject: Rename testcase_base to testcase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It simply removes the useless suffix. Change-Id: Ib9a682b57d8f33518359d817a593bb3786577390 Signed-off-by: Cédric Ollivier --- .../openstack/refstack_client/refstack_client.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'functest/opnfv_tests/openstack/refstack_client') diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py index 420c4ff9..597ece3e 100755 --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -12,7 +12,7 @@ import sys import subprocess import time -from functest.core import testcase_base +from functest.core import testcase from functest.opnfv_tests.openstack.tempest import conf_utils from functest.utils import openstack_utils from functest.utils.constants import CONST @@ -23,7 +23,7 @@ import functest.utils.functest_utils as ft_utils logger = ft_logger.Logger("refstack_defcore").getLogger() -class RefstackClient(testcase_base.TestCase): +class RefstackClient(testcase.TestCase): def __init__(self): super(RefstackClient, self).__init__() @@ -150,10 +150,10 @@ class RefstackClient(testcase_base.TestCase): conf_utils.configure_tempest_defcore( self.DEPLOYMENT_DIR, img_flavor_dict) self.source_venv() - res = testcase_base.TestCase.EX_OK + res = testcase.TestCase.EX_OK except KeyError as e: logger.error("defcore prepare env error with: %s", e) - res = testcase_base.TestCase.EX_RUN_ERROR + res = testcase.TestCase.EX_RUN_ERROR return res @@ -167,10 +167,10 @@ class RefstackClient(testcase_base.TestCase): self.defcore_env_prepare() self.run_defcore_default() self.parse_refstack_result() - res = testcase_base.TestCase.EX_OK + res = testcase.TestCase.EX_OK except Exception as e: logger.error('Error with run: %s', e) - res = testcase_base.TestCase.EX_RUN_ERROR + res = testcase.TestCase.EX_RUN_ERROR self.stop_time = time.time() return res @@ -187,15 +187,15 @@ class RefstackClient(testcase_base.TestCase): openstack_utils.source_credentials(CONST.openstack_creds) self.defcore_env_prepare() self.run_defcore(tempestconf, testlist) - res = testcase_base.TestCase.EX_OK + res = testcase.TestCase.EX_OK except Exception as e: logger.error('Error with run: %s', e) - res = testcase_base.TestCase.EX_RUN_ERROR + res = testcase.TestCase.EX_RUN_ERROR return res -class RefstackClientParser(testcase_base.TestCase): +class RefstackClientParser(testcase.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.TestCase.EX_OK: + if result != testcase.TestCase.EX_OK: sys.exit(result) except Exception: - sys.exit(testcase_base.TestCase.EX_RUN_ERROR) + sys.exit(testcase.TestCase.EX_RUN_ERROR) -- cgit 1.2.3-korg