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 --- functest/core/feature_base.py | 2 +- functest/core/pytest_suite_runner.py | 2 +- functest/core/testcase.py | 64 ++++++++++++++++++++++++++++++++++++ functest/core/testcase_base.py | 64 ------------------------------------ functest/core/vnf_base.py | 2 +- 5 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 functest/core/testcase.py delete mode 100644 functest/core/testcase_base.py (limited to 'functest/core') diff --git a/functest/core/feature_base.py b/functest/core/feature_base.py index 9224d6c9..f7f3e460 100644 --- a/functest/core/feature_base.py +++ b/functest/core/feature_base.py @@ -1,6 +1,6 @@ import time -import testcase_base as base +import testcase as base import functest.utils.functest_utils as ft_utils import functest.utils.functest_logger as ft_logger from functest.utils.constants import CONST diff --git a/functest/core/pytest_suite_runner.py b/functest/core/pytest_suite_runner.py index db60cefc..4f777628 100644 --- a/functest/core/pytest_suite_runner.py +++ b/functest/core/pytest_suite_runner.py @@ -5,7 +5,7 @@ # # http://www.apache.org/licenses/LICENSE-2.0 -import testcase_base as base +import testcase as base import unittest import time diff --git a/functest/core/testcase.py b/functest/core/testcase.py new file mode 100644 index 00000000..85d1fc74 --- /dev/null +++ b/functest/core/testcase.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python + +# Copyright (c) 2016 Orange and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 + +import os + +import functest.utils.functest_logger as ft_logger +import functest.utils.functest_utils as ft_utils + + +class TestCase(object): + + EX_OK = os.EX_OK + EX_RUN_ERROR = os.EX_SOFTWARE + EX_PUSH_TO_DB_ERROR = os.EX_SOFTWARE - 1 + EX_TESTCASE_FAILED = os.EX_SOFTWARE - 2 + + logger = ft_logger.Logger(__name__).getLogger() + + def __init__(self): + self.details = {} + self.project_name = "functest" + self.case_name = "" + self.criteria = "" + self.start_time = "" + self.stop_time = "" + + def check_criteria(self): + try: + assert self.criteria + if self.criteria == 'PASS': + return TestCase.EX_OK + except AssertionError: + self.logger.error("Please run test before checking the results") + return TestCase.EX_TESTCASE_FAILED + + def run(self, **kwargs): + # pylint: disable=unused-argument + self.logger.error("Run must be implemented") + return TestCase.EX_RUN_ERROR + + def push_to_db(self): + try: + assert self.project_name + assert self.case_name + assert self.criteria + assert self.start_time + assert self.stop_time + if ft_utils.push_results_to_db( + self.project_name, self.case_name, self.start_time, + self.stop_time, self.criteria, self.details): + self.logger.info("The results were successfully pushed to DB") + return TestCase.EX_OK + else: + self.logger.error("The results cannot be pushed to DB") + return TestCase.EX_PUSH_TO_DB_ERROR + except Exception: # pylint: disable=broad-except + self.logger.exception("The results cannot be pushed to DB") + return TestCase.EX_PUSH_TO_DB_ERROR diff --git a/functest/core/testcase_base.py b/functest/core/testcase_base.py deleted file mode 100644 index 85d1fc74..00000000 --- a/functest/core/testcase_base.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2016 Orange and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 - -import os - -import functest.utils.functest_logger as ft_logger -import functest.utils.functest_utils as ft_utils - - -class TestCase(object): - - EX_OK = os.EX_OK - EX_RUN_ERROR = os.EX_SOFTWARE - EX_PUSH_TO_DB_ERROR = os.EX_SOFTWARE - 1 - EX_TESTCASE_FAILED = os.EX_SOFTWARE - 2 - - logger = ft_logger.Logger(__name__).getLogger() - - def __init__(self): - self.details = {} - self.project_name = "functest" - self.case_name = "" - self.criteria = "" - self.start_time = "" - self.stop_time = "" - - def check_criteria(self): - try: - assert self.criteria - if self.criteria == 'PASS': - return TestCase.EX_OK - except AssertionError: - self.logger.error("Please run test before checking the results") - return TestCase.EX_TESTCASE_FAILED - - def run(self, **kwargs): - # pylint: disable=unused-argument - self.logger.error("Run must be implemented") - return TestCase.EX_RUN_ERROR - - def push_to_db(self): - try: - assert self.project_name - assert self.case_name - assert self.criteria - assert self.start_time - assert self.stop_time - if ft_utils.push_results_to_db( - self.project_name, self.case_name, self.start_time, - self.stop_time, self.criteria, self.details): - self.logger.info("The results were successfully pushed to DB") - return TestCase.EX_OK - else: - self.logger.error("The results cannot be pushed to DB") - return TestCase.EX_PUSH_TO_DB_ERROR - except Exception: # pylint: disable=broad-except - self.logger.exception("The results cannot be pushed to DB") - return TestCase.EX_PUSH_TO_DB_ERROR diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py index cd689c27..c374c491 100644 --- a/functest/core/vnf_base.py +++ b/functest/core/vnf_base.py @@ -14,7 +14,7 @@ import inspect import functest.utils.functest_logger as ft_logger import functest.utils.openstack_utils as os_utils import functest.utils.functest_utils as ft_utils -import testcase_base as base +import testcase as base from functest.utils.constants import CONST -- cgit 1.2.3-korg