diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-04-30 08:52:55 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-04 16:15:20 +0200 |
| commit | a87a5f00e1d32af5b193d0376778c966f1aaab3f (patch) | |
| tree | a58d83c53cdb1a09c2d87283f95013fc9b31aad6 /functest/core | |
| parent | 392cae434cce5dcf5a5e8dedc18b2791e3dd8e94 (diff) | |
Delete functest.utils.functest_logger
It deletes functest.utils.functest_logger and the related unit tests.
Then it modifies all functest modules to get all loggers via
logging.getLogger(). __name__ is mainly used as getLogger arg as
proposed by logging [1].
All loggers and handlers are now defined via functest/ci/logging.ini
instead of a dict loaded by an external json file.
Now only warn messages and info messages from ci and core packages are
printed in console.
[1] https://docs.python.org/2/library/logging.html
Change-Id: Ic192855e0f9bf94825d8f7ec73549a0f3b8d44c5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/core')
| -rw-r--r-- | functest/core/feature.py | 5 | ||||
| -rw-r--r-- | functest/core/testcase.py | 4 | ||||
| -rw-r--r-- | functest/core/vnf_base.py | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/functest/core/feature.py b/functest/core/feature.py index d65f5a3c..992de98a 100644 --- a/functest/core/feature.py +++ b/functest/core/feature.py @@ -13,11 +13,11 @@ Feature is considered as TestCase offered by Third-party. It offers helpers to run any python method or any bash command. """ +import logging import time import functest.core.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 __author__ = ("Serena Feng <feng.xiaowei@zte.com.cn>, " @@ -27,11 +27,12 @@ __author__ = ("Serena Feng <feng.xiaowei@zte.com.cn>, " class Feature(base.TestCase): """Base model for single feature.""" + logger = logging.getLogger(__name__) + def __init__(self, **kwargs): super(Feature, self).__init__(**kwargs) self.result_file = "{}/{}.log".format( CONST.__getattribute__('dir_results'), self.project_name) - self.logger = ft_logger.Logger(self.project_name).getLogger() def execute(self, **kwargs): """Execute the Python method. diff --git a/functest/core/testcase.py b/functest/core/testcase.py index 3f191b40..0b87f265 100644 --- a/functest/core/testcase.py +++ b/functest/core/testcase.py @@ -9,9 +9,9 @@ """Define the parent class of all Functest TestCases.""" +import logging import os -import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils __author__ = "Cedric Ollivier <cedric.ollivier@orange.com>" @@ -32,7 +32,7 @@ class TestCase(object): EX_TESTCASE_FAILED = os.EX_SOFTWARE - 2 """results are false""" - logger = ft_logger.Logger(__name__).getLogger() + logger = logging.getLogger(__name__) def __init__(self, **kwargs): self.details = {} diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py index fe4e427f..d91a608b 100644 --- a/functest/core/vnf_base.py +++ b/functest/core/vnf_base.py @@ -8,18 +8,18 @@ # http://www.apache.org/licenses/LICENSE-2.0 import inspect +import logging import time import functest.core.testcase as base from functest.utils.constants import CONST -import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils class VnfOnBoardingBase(base.TestCase): - logger = ft_logger.Logger(__name__).getLogger() + logger = logging.getLogger(__name__) def __init__(self, **kwargs): super(VnfOnBoardingBase, self).__init__(**kwargs) |