Merge "Turn Sphinx warnings into errors"

[functest.git] / functest / core / feature.py

diff --git a/functest/core/feature.py b/functest/core/feature.py
index 992de98..140c9bb 100644 (file)
--- a/functest/core/feature.py
+++ b/functest/core/feature.py
@@ -27,12 +27,12 @@ __author__ = ("Serena Feng <feng.xiaowei@zte.com.cn>, "
 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