[svn] commit: r2006 - in /branches/trac176: configure.ac src/lib/python/isc/log/Makefile.am src/lib/python/isc/log/log.py src/lib/python/isc/log/tests/Makefile.am src/lib/python/isc/log/tests/log_test.in

[BIND 10 source code commits]

Author: chenzhengzhang
Date: Mon May 31 09:36:27 2010
New Revision: 2006

Log:
Add unittest shell script
Add __init__ function to RotatingFileHandler class


Added:
    branches/trac176/src/lib/python/isc/log/tests/log_test.in
Modified:
    branches/trac176/configure.ac
    branches/trac176/src/lib/python/isc/log/Makefile.am
    branches/trac176/src/lib/python/isc/log/log.py
    branches/trac176/src/lib/python/isc/log/tests/Makefile.am

Modified: branches/trac176/configure.ac
==============================================================================
--- branches/trac176/configure.ac (original)
+++ branches/trac176/configure.ac Mon May 31 09:36:27 2010
@@ -437,6 +437,7 @@
            src/lib/config/tests/data_def_unittests_config.h
            src/lib/python/isc/config/tests/config_test
            src/lib/python/isc/cc/tests/cc_test
+           src/lib/python/isc/log/tests/log_test
            src/lib/dns/gen-rdatacode.py
            src/lib/dns/tests/testdata/gen-wiredata.py
           ], [

Modified: branches/trac176/src/lib/python/isc/log/Makefile.am
==============================================================================
--- branches/trac176/src/lib/python/isc/log/Makefile.am (original)
+++ branches/trac176/src/lib/python/isc/log/Makefile.am Mon May 31 09:36:27 2010
@@ -4,3 +4,5 @@
 
 pythondir = $(pyexecdir)/isc/log
 
+pytest:
+	$(SHELL) tests/log_test

Modified: branches/trac176/src/lib/python/isc/log/log.py
==============================================================================
--- branches/trac176/src/lib/python/isc/log/log.py (original)
+++ branches/trac176/src/lib/python/isc/log/log.py Mon May 31 09:36:27 2010
@@ -37,6 +37,10 @@
 time_formatter = logging.Formatter("%(asctime)s: %(name)s: %(levelname)s: %(message)s")
 
 class RotatingFileHandler(logging.handlers.RotatingFileHandler):
+
+    def __init__(self, filename, mode='a', maxBytes=0, backupCount=0, encoding=None, delay=0):
+        super(RotatingFileHandler, self).__init__(filename, mode, maxBytes,
+                                                  backupCount, encoding, delay)
     """
     RotatingFileHandler: replace RotatingFileHandler with a custom handler 
     """
@@ -44,7 +48,7 @@
         """
         Rewrite RotatingFileHandler.shouldRollover. 
        
-        If the log file is deleted at run-time, a new file will be created. 
+        If the log file is deleted at runtime, a new file will be created. 
         """
         dfn = self.baseFilename                 
         if (self.stream) and (not os.path.exists(dfn)): #Is log file exist?
@@ -81,7 +85,7 @@
     
         If facility is not specified, LOG_USER is used.
         """
-        super(SLHandler, self).__init__(self)
+        super(SLHandler, self).__init__()
         self.ident = ident        
         self.logopt = logopt        
         self.facility = facility        
@@ -118,8 +122,8 @@
     Override logging.logger behaviour
     """
     def __init__(self, log_name, log_file, 
-                 severity = 'debug', backup_count = 0, max_bytes = 0,
-                 log_to_console = True):
+                 severity='debug', backup_count=0, max_bytes=0,
+                 log_to_console=True):
         """
         Initializes the logger with some specific parameters
 
@@ -164,8 +168,7 @@
         if(log_file != 0  and log_file != ''):
             try:
                 self.rotating_handler = RotatingFileHandler(filename = log_file, 
-                                                            maxBytes = max_bytes, 
-                                                            backupCount = backup_count)
+                                              maxBytes = max_bytes, backupCount = backup_count)
             except IOError:
                 self.rotating_handler = None
                 return

Modified: branches/trac176/src/lib/python/isc/log/tests/Makefile.am
==============================================================================
--- branches/trac176/src/lib/python/isc/log/tests/Makefile.am (original)
+++ branches/trac176/src/lib/python/isc/log/tests/Makefile.am Mon May 31 09:36:27 2010
@@ -7,6 +7,6 @@
 check-local:
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
-	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python \
+	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python::$(abs_top_builddir)/src/lib/python/isc/log \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done