X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fcore%2Ffeature.py;h=140c9bb2eb42bcbe6176e6b2baebc10031edfa5b;hb=7e6191e9d4f3734efb1aacf2ded8c20b16aeb4af;hp=992de98af10f5ca7acfac15f17b017d91870ed2a;hpb=533e08503e5888adb7a7cfa8b112502385130a8f;p=functest.git diff --git a/functest/core/feature.py b/functest/core/feature.py index 992de98af..140c9bb2e 100644 --- a/functest/core/feature.py +++ b/functest/core/feature.py @@ -27,12 +27,12 @@ __author__ = ("Serena Feng , " class Feature(base.TestCase): """Base model for single feature.""" - logger = logging.getLogger(__name__) + __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) + CONST.__getattribute__('dir_results'), self.case_name) def execute(self, **kwargs): """Execute the Python method. @@ -83,10 +83,9 @@ class Feature(base.TestCase): ft_utils.logger_test_results( self.project_name, self.case_name, self.result, self.details) - self.logger.info("%s %s", self.project_name, self.result) except Exception: # pylint: disable=broad-except - self.logger.exception("%s FAILED", self.project_name) - self.logger.info("Test result is stored in '%s'", self.result_file) + self.__logger.exception("%s FAILED", self.project_name) + self.__logger.info("Test result is stored in '%s'", self.result_file) self.stop_time = time.time() return exit_code @@ -94,6 +93,8 @@ class Feature(base.TestCase): class BashFeature(Feature): """Class designed to run any bash command.""" + __logger = logging.getLogger(__name__) + def execute(self, **kwargs): """Execute the cmd passed as arg @@ -109,7 +110,7 @@ class BashFeature(Feature): cmd = kwargs["cmd"] ret = ft_utils.execute_command(cmd, output_file=self.result_file) except KeyError: - self.logger.error("Please give cmd as arg. kwargs: %s", kwargs) + self.__logger.error("Please give cmd as arg. kwargs: %s", kwargs) except Exception: # pylint: disable=broad-except - self.logger.exception("Execute cmd: %s failed", cmd) + self.__logger.exception("Execute cmd: %s failed", cmd) return ret