Issue #11330: Updated tests for correct asctime handling.

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index da12a0eb109bdb78d511f45de095b2ba6a6378c9..d9ac7d9c131f3893f5f3919f0a272170079b03f6 100644 (file)
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -383,7 +383,7 @@ class StrFormatStyle(PercentStyle):
 class StringTemplateStyle(PercentStyle):
     default_format = '${message}'
     asctime_format = '${asctime}'
-    asctime_search = '${asctime'
+    asctime_search = '${asctime}'
 
     def __init__(self, fmt):
         self._fmt = fmt or self.default_format

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 9492b8083e042d96cdad64eda1c3f16bc5db1b07..b29d4005eebbca8944b9a90a8bfbd022eb5ba4d0 100644 (file)
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1907,6 +1907,8 @@ class FormatterTest(unittest.TestCase):
         self.assertFalse(f.usesTime())
         f = logging.Formatter('%(asctime)s')
         self.assertTrue(f.usesTime())
+        f = logging.Formatter('%(asctime)-15s')
+        self.assertTrue(f.usesTime())
         f = logging.Formatter('asctime')
         self.assertFalse(f.usesTime())
 
@@ -1920,6 +1922,10 @@ class FormatterTest(unittest.TestCase):
         self.assertFalse(f.usesTime())
         f = logging.Formatter('{asctime}', style='{')
         self.assertTrue(f.usesTime())
+        f = logging.Formatter('{asctime!s:15}', style='{')
+        self.assertTrue(f.usesTime())
+        f = logging.Formatter('{asctime:15}', style='{')
+        self.assertTrue(f.usesTime())
         f = logging.Formatter('asctime', style='{')
         self.assertFalse(f.usesTime())
 
@@ -1935,6 +1941,8 @@ class FormatterTest(unittest.TestCase):
         self.assertFalse(f.usesTime())
         f = logging.Formatter('${asctime}', style='$')
         self.assertTrue(f.usesTime())
+        f = logging.Formatter('${asctime', style='$')
+        self.assertFalse(f.usesTime())
         f = logging.Formatter('$asctime', style='$')
         self.assertTrue(f.usesTime())
         f = logging.Formatter('asctime', style='$')
@@ -2097,7 +2105,7 @@ def test_main():
                  LogRecordFactoryTest, ChildLoggerTest, QueueHandlerTest,
                  RotatingFileHandlerTest,
                  LastResortTest,
-                 #TimedRotatingFileHandlerTest
+                 TimedRotatingFileHandlerTest
                 )
 
 if __name__ == "__main__":