Update of /cvsroot/pywin32/pywin32/win32/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28658
Modified Files:
test_win32file.py
Log Message:
fix FILETIME tests (mostly) for py2k
Index: test_win32file.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32file.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** test_win32file.py 8 Jan 2009 03:35:41 -0000 1.24
--- test_win32file.py 14 Jan 2009 01:20:58 -0000 1.25
***************
*** 125,135 ****
from win32timezone import GetLocalTimeZone
now = datetime.datetime.now(tz=GetLocalTimeZone())
! ok_delta = datetime.timedelta(seconds=1)
later = now + datetime.timedelta(seconds=120)
else:
tick = int(time.time())
! now = pywintypes.Time(tick)
! ok_delta = 1
! later = pywintypes.Time(tick+120)
filename = tempfile.mktemp("-testFileTimes")
--- 125,140 ----
from win32timezone import GetLocalTimeZone
now = datetime.datetime.now(tz=GetLocalTimeZone())
! nowish = now + datetime.timedelta(seconds=1)
later = now + datetime.timedelta(seconds=120)
else:
+ rc, tzi = win32api.GetTimeZoneInformation()
+ bias = tzi[0]
+ if rc==2: # daylight-savings is in effect.
+ bias += tzi[-1]
+ bias *= 60 # minutes to seconds...
tick = int(time.time())
! now = pywintypes.Time(tick+bias)
! nowish = pywintypes.Time(tick+bias+1)
! later = pywintypes.Time(tick+bias+120)
filename = tempfile.mktemp("-testFileTimes")
***************
*** 140,154 ****
0, None,
win32con.OPEN_EXISTING, 0, None)
- # *sob* - before we had tz aware datetime objects, we are faced
- # with FILETIME objects being +GST out from now(). So just skip
- # this...
- if not issubclass(pywintypes.TimeType, datetime.datetime):
- return
try:
ct, at, wt = win32file.GetFileTime(f)
self.failUnless(ct >= now, "File was created in the past - now=%s, created=%s" % (now, ct))
! self.failUnless( now <= ct <= now + ok_delta, (now, ct))
self.failUnless(wt >= now, "File was written-to in the past now=%s, written=%s" % (now,wt))
! self.failUnless( now <= wt <= now + ok_delta, (now, wt))
# Now set the times.
--- 145,154 ----
0, None,
win32con.OPEN_EXISTING, 0, None)
try:
ct, at, wt = win32file.GetFileTime(f)
self.failUnless(ct >= now, "File was created in the past - now=%s, created=%s" % (now, ct))
! self.failUnless( now <= ct <= nowish, (now, ct))
self.failUnless(wt >= now, "File was written-to in the past now=%s, written=%s" % (now,wt))
! self.failUnless( now <= wt <= nowish, (now, wt))
# Now set the times.
***************
*** 156,162 ****
# Get them back.
ct, at, wt = win32file.GetFileTime(f)
! self.failUnlessEqual(ct, later)
! self.failUnlessEqual(at, later)
! self.failUnlessEqual(wt, later)
finally:
--- 156,165 ----
# Get them back.
ct, at, wt = win32file.GetFileTime(f)
! # XXX - the builtin PyTime type appears to be out by a dst offset.
! # just ignore that type here...
! if issubclass(pywintypes.TimeType, datetime.datetime):
! self.failUnlessEqual(ct, later)
! self.failUnlessEqual(at, later)
! self.failUnlessEqual(wt, later)
finally:
|
