[Python-checkins] cpython: Refined time test in test_logging.

Tue Apr 26 21:26:48 CEST 2011

http://hg.python.org/cpython/rev/5185e1d91f3d
changeset: 69578:5185e1d91f3d
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Tue Apr 26 20:26:41 2011 +0100
summary:
 Refined time test in test_logging.
files:
 Lib/test/test_logging.py | 17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -43,6 +43,7 @@
 from test.support import captured_stdout, run_with_locale, run_unittest, patch
 from test.support import TestHandler, Matcher
 import textwrap
+import time
 import unittest
 import warnings
 import weakref
@@ -2190,6 +2191,18 @@
 self.assertTrue(handler.matches(levelno=logging.ERROR, message='2'))
 self.assertTrue(handler.matches(levelno=logging.CRITICAL, message='3'))
 
+ZERO = datetime.timedelta(0)
+
+class UTC(datetime.tzinfo):
+ def utcoffset(self, dt):
+ return ZERO
+
+ dst = utcoffset
+
+ def tzname(self, dt):
+ return 'UTC'
+
+utc = UTC()
 
 class FormatterTest(unittest.TestCase):
 def setUp(self):
@@ -2268,9 +2281,11 @@
 
 def test_time(self):
 r = self.get_record()
- r.created = 735375780.0 # 21 April 1993 08:03:00
+ dt = datetime.datetime(1993,4,21,8,3,0,0,utc)
+ r.created = time.mktime(dt.utctimetuple())
 r.msecs = 123
 f = logging.Formatter('%(asctime)s %(message)s')
+ f.converter = time.gmtime
 self.assertEqual(f.formatTime(r), '1993-04-21 08:03:00,123')
 self.assertEqual(f.formatTime(r, '%Y:%d'), '1993:21')
 f.format(r)
-- 
Repository URL: http://hg.python.org/cpython
