From bb673bb9f4e38736421efce3ceb4910995d5acc4 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 28 Aug 2014 10:44:12 +0200
Subject: [PATCH] Improve logging in the Python module unit tests.

---
 tools/python/unittests/linphonetester.py | 32 ++++++++++++++----------
 tools/python/unittests/test_register.py  |  2 +-
 tools/python/unittests/test_setup.py     |  6 +++++
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index 9a32432bc..10e51613c 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -11,19 +11,6 @@ test_password = "secret"
 test_route = "sip2.linphone.org"
 
 
-def log_handler(level, msg):
-    method = getattr(logging, level)
-    if not msg.strip().startswith('[PYLINPHONE]'):
-        msg = '[CORE] ' + msg
-    method(msg)
-
-def setup_logging(filename):
-    format = "%(asctime)s.%(msecs)03d %(levelname)s: %(message)s"
-    datefmt = "%H:%M:%S"
-    logging.basicConfig(filename=filename, level=logging.INFO, format=format, datefmt=datefmt)
-    linphone.set_log_handler(log_handler)
-
-
 def create_address(domain):
     addr = linphone.Address.new(None)
     assert addr != None
@@ -39,6 +26,25 @@ def create_address(domain):
     return addr
 
 
+class Logger(logging.Logger):
+
+    def __init__(self, filename):
+        logging.Logger.__init__(self, filename)
+        self.setLevel(logging.INFO)
+        handler = logging.FileHandler(filename)
+        handler.setLevel(logging.INFO)
+        formatter = logging.Formatter('%(asctime)s.%(msecs)03d %(levelname)s: %(message)s', '%H:%M:%S')
+        handler.setFormatter(formatter)
+        self.addHandler(handler)
+        linphone.set_log_handler(self.log_handler)
+
+    def log_handler(self, level, msg):
+        method = getattr(self, level)
+        if not msg.strip().startswith('[PYLINPHONE]'):
+            msg = '[CORE] ' + msg
+        method(msg)
+
+
 class CoreManagerStats:
     def __init__(self):
         self.reset()
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index 92c5e86aa..bce6a9a42 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -78,7 +78,7 @@ class TestRegister:
     @classmethod
     def setup_class(cls):
         base, ext = os.path.splitext(os.path.basename(__file__))
-        linphonetester.setup_logging(base + '.log')
+        cls.logger = linphonetester.Logger(base + '.log')
 
     def test_simple_register(self):
         cm = RegisterCoreManager()
diff --git a/tools/python/unittests/test_setup.py b/tools/python/unittests/test_setup.py
index af0311325..d0a7c6b73 100644
--- a/tools/python/unittests/test_setup.py
+++ b/tools/python/unittests/test_setup.py
@@ -1,9 +1,15 @@
 from nose.tools import assert_equals
 import linphone
 import linphonetester
+import os
 
 class TestSetup:
 
+    @classmethod
+    def setup_class(cls):
+        base, ext = os.path.splitext(os.path.basename(__file__))
+        cls.logger = linphonetester.Logger(base + '.log')
+
     def test_address(self):
         linphonetester.create_address(None)