From 75dd45462f46c711f950c96aac783932cb7ec1a4 Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Tue, 8 Nov 2016 11:43:28 +0000
Subject: dovetail tool: package all logger initialization

1. For container.py, parser.py, report.py and testcase.py, they use functions
   in classes to create loggers. So each class will have its own logger.
2. run.py will create all the loggers by create_logs() function before the use
   of them. So logs will not be initialized until the call of create_logs().
3. Move logger in run.py into function main().

JIRA: DOVETAIL-56

Change-Id: I53de090df270cc7a34762ff99cbc9115cfb09465
Signed-off-by: xudan <xudan16@huawei.com>
---
 dovetail/testcase.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'dovetail/testcase.py')

diff --git a/dovetail/testcase.py b/dovetail/testcase.py
index b5d28aa1..60ce2b28 100644
--- a/dovetail/testcase.py
+++ b/dovetail/testcase.py
@@ -15,11 +15,11 @@ import utils.dovetail_logger as dt_logger
 from parser import Parser
 from conf.dovetail_config import DovetailConfig as dt_config
 
-logger = dt_logger.Logger('testcase.py').getLogger()
-
 
 class Testcase:
 
+    logger = None
+
     def __init__(self, testcase_yaml):
         self.testcase = testcase_yaml.values()[0]
         self.testcase['passed'] = False
@@ -28,6 +28,10 @@ class Testcase:
         self.update_script_testcase(self.script_type(),
                                     self.script_testcase())
 
+    @classmethod
+    def create_log(cls):
+        cls.logger = dt_logger.Logger(__name__+'.Testcase').getLogger()
+
     def prepare_cmd(self):
         script_type = self.script_type()
         for cmd in dt_config.dovetail_config[script_type]['testcase']['cmds']:
@@ -52,7 +56,7 @@ class Testcase:
 
     def sub_testcase_passed(self, name, passed=None):
         if passed is not None:
-            logger.debug('sub_testcase_passed:%s %s' % (name,  passed))
+            self.logger.debug('sub_testcase_passed:%s %s' % (name,  passed))
             self.sub_testcase_status[name] = passed
         return self.sub_testcase_status[name]
 
@@ -146,7 +150,7 @@ class Testcase:
                     testcase_yaml = yaml.safe_load(f)
                     cls.testcase_list[testcase_yaml.keys()[0]] = \
                         cls(testcase_yaml)
-        logger.debug(cls.testcase_list)
+        cls.logger.debug(cls.testcase_list)
 
     @classmethod
     def get(cls, testcase_name):
@@ -157,10 +161,16 @@ class Testcase:
 
 class Testsuite:
 
+    logger = None
+
     def __init__(self, testsuite):
         self.testsuite = testsuite
         self.testcase_list = {}
 
+    @classmethod
+    def create_log(cls):
+        cls.logger = dt_logger.Logger(__name__+'.Testsuite').getLogger()
+
     def get_test(self, testcase_name):
         if testcase_name in self.testcase_list:
             return self.testcase_list[testcase_name]
@@ -176,7 +186,7 @@ class Testsuite:
                     testsuite_yaml = yaml.safe_load(f)
                     cls.testsuite_list.update(testsuite_yaml)
 
-        logger.debug(cls.testsuite_list)
+        cls.logger.debug(cls.testsuite_list)
 
     @classmethod
     def get(cls, testsuite_name):
-- 
cgit 1.2.3-korg