[Python-checkins] r76876 - in python/branches/release31-maint: Lib/test/test_strptime.py

[ezio.melotti]

Author: ezio.melotti
Date: Fri Dec 18 16:37:48 2009
New Revision: 76876

Log:
Merged revisions 76875 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76875 | ezio.melotti | 2009-12-18 17:35:27 +0200 (Fri, 18 Dec 2009) | 9 lines
  
  Merged revisions 76804 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r76804 | ezio.melotti | 2009-12-13 20:54:53 +0200 (Sun, 13 Dec 2009) | 1 line
    
    #7342: make sure that the datetime object in test_fraction always has a number of microseconds != 0
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_strptime.py

Modified: python/branches/release31-maint/Lib/test/test_strptime.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_strptime.py	(original)
+++ python/branches/release31-maint/Lib/test/test_strptime.py	Fri Dec 18 16:37:48 2009
@@ -274,10 +274,11 @@
         self.helper('S', 5)
 
     def test_fraction(self):
+        # Test microseconds
         import datetime
-        now = datetime.datetime.now()
-        tup, frac = _strptime._strptime(str(now), format="%Y-%m-%d %H:%M:%S.%f")
-        self.assertEqual(frac, now.microsecond)
+        d = datetime.datetime(2012, 12, 20, 12, 34, 56, 78987)
+        tup, frac = _strptime._strptime(str(d), format="%Y-%m-%d %H:%M:%S.%f")
+        self.assertEqual(frac, d.microsecond)
 
     def test_weekday(self):
         # Test weekday directives