Merge e755c17 into 07a0d0a

zopefoundation · Dec 29, 2018 · ea9c810 · ea9c810
2 parents 07a0d0a + e755c17
commit ea9c810
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 29 deletions.
diff --git a/ZConfig/components/logger/formatter.py b/ZConfig/components/logger/formatter.py
@@ -91,16 +91,16 @@ def format(self, record):
 
 _log_format_variables = {
     'name': __name__,
-    'levelno': '3',
+    'levelno': 3,
     'levelname': 'DEBUG',
     'pathname': 'apath',
     'filename': 'afile',
     'module': 'amodule',
     'lineno': 1,
     'created': 1.1,
     'asctime': 'atime',
-    'msecs': 1,
-    'relativeCreated': 1,
+    'msecs': 1.1,
+    'relativeCreated': 1.1,
     'thread': 1,
     'message': 'amessage',
     'process': 1,

diff --git a/ZConfig/components/logger/handlers.py b/ZConfig/components/logger/handlers.py
@@ -23,22 +23,8 @@
 import ZConfig.components.logger.formatter
 
 
-_log_format_variables = {
-    'name': '',
-    'levelno': '3',
-    'levelname': 'DEBUG',
-    'pathname': 'apath',
-    'filename': 'afile',
-    'module': 'amodule',
-    'lineno': 1,
-    'created': 1.1,
-    'asctime': 'atime',
-    'msecs': 1,
-    'relativeCreated': 1,
-    'thread': 1,
-    'message': 'amessage',
-    'process': 1,
-    }
+_log_format_variables = (
+    ZConfig.components.logger.formatter._log_format_variables)
 
 
 def log_format(value):

diff --git a/ZConfig/components/logger/tests/test_formatter.py b/ZConfig/components/logger/tests/test_formatter.py
@@ -82,6 +82,16 @@ class StyledFormatterTestHelper(
       </schema>
     """
 
+    _config_template = """\
+      <eventlog>
+        <logfile>
+          path STDOUT
+          level debug
+          %s
+        </logfile>
+      </eventlog>
+    """
+
     def setUp(self):
         ZConfig.components.logger.tests.support.LoggingTestHelper.setUp(self)
         self.record = logging.LogRecord(
@@ -108,16 +118,6 @@ def get_formatter_factory(self, style=None, format=None):
 class LoggerStyledFormatterTestCase(StyledFormatterTestHelper,
                                     unittest.TestCase):
 
-    _config_template = """\
-      <eventlog>
-        <logfile>
-          path STDOUT
-          level debug
-          %s
-        </logfile>
-      </eventlog>
-    """
-
     def test_classic_explicit(self):
         factory = self.get_formatter_factory(
             style='classic',
@@ -445,3 +445,60 @@ def test_format_with_unicode_traceback_content_trailing_msg_newline(self):
         msg = formatter.format(self.record)
 
         self.assertIsInstance(msg, unicode)  # NOQA
+
+
+class FieldTypesTestCase(StyledFormatterTestHelper, unittest.TestCase):
+
+    def test_levelno_integer_classic(self):
+        factory = self.get_formatter_factory(
+            style='classic',
+            format='%(levelname)s %(levelno)2d %(message)s')
+        formatter = factory()
+        output = formatter.format(self.record)
+        self.assertIn('WARNING 30 my message', output)
+
+    def test_levelno_integer_format(self):
+        factory = self.get_formatter_factory(
+            style='format',
+            format='{levelname} {levelno:02d} {message}')
+        formatter = factory()
+        output = formatter.format(self.record)
+        self.assertIn('WARNING 30 my message', output)
+
+    def test_msecs_float_classic(self):
+        factory = self.get_formatter_factory(
+            style='classic',
+            format='%(asctime)s.%(msecs)03.0f %(levelname)s %(message)s')
+        formatter = factory()
+        self.record.msecs = 619.041919708252
+        output = formatter.format(self.record)
+        expected = '%s.619 WARNING my message' % self.record.asctime
+        self.assertIn(expected, output)
+
+    def test_msecs_float_format(self):
+        factory = self.get_formatter_factory(
+            style='format',
+            format='{asctime}.{msecs:03.0f} {levelname} {message}')
+        formatter = factory()
+        self.record.msecs = 619.041919708252
+        output = formatter.format(self.record)
+        expected = '%s.619 WARNING my message' % self.record.asctime
+        self.assertIn(expected, output)
+
+    def test_relative_created_float_classic(self):
+        factory = self.get_formatter_factory(
+            style='classic',
+            format='%(relativeCreated)+.3f %(levelname)s %(message)s')
+        formatter = factory()
+        self.record.relativeCreated = 406.7840576171875
+        output = formatter.format(self.record)
+        self.assertIn('+406.784 WARNING my message', output)
+
+    def test_relative_created_float_format(self):
+        factory = self.get_formatter_factory(
+            style='format',
+            format='{relativeCreated:+.3f} {levelname} {message}')
+        formatter = factory()
+        self.record.relativeCreated = 406.7840576171875
+        output = formatter.format(self.record)
+        self.assertIn('+406.784 WARNING my message', output)