[Python-checkins] cpython (merge 3.3 -> default): (Merge 3.3) Close #15165: Fix test_email on Windows 64 bits
victor.stinner
python-checkins at python.org
Mon Nov 5 02:06:25 CET 2012
http://hg.python.org/cpython/rev/651e8613e579
changeset: 80262:651e8613e579
parent: 80260:11ea4eb79e9d
parent: 80261:367e376e5ba2
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Nov 05 02:06:34 2012 +0100
summary:
(Merge 3.3) Close #15165: Fix test_email on Windows 64 bits
Use year 1990 instead of year 1970 to avoid issues with negative timestamps.
files:
Lib/test/test_email/test_utils.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -91,7 +91,7 @@
@test.support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
def test_localtime_epoch_utc_daylight_true(self):
test.support.patch(self, time, 'daylight', True)
- t0 = datetime.datetime(1970, 1, 1, tzinfo = datetime.timezone.utc)
+ t0 = datetime.datetime(1990, 1, 1, tzinfo = datetime.timezone.utc)
t1 = utils.localtime(t0)
t2 = t0 - datetime.timedelta(hours=5)
t2 = t2.replace(tzinfo = datetime.timezone(datetime.timedelta(hours=-5)))
@@ -100,7 +100,7 @@
@test.support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
def test_localtime_epoch_utc_daylight_false(self):
test.support.patch(self, time, 'daylight', False)
- t0 = datetime.datetime(1970, 1, 1, tzinfo = datetime.timezone.utc)
+ t0 = datetime.datetime(1990, 1, 1, tzinfo = datetime.timezone.utc)
t1 = utils.localtime(t0)
t2 = t0 - datetime.timedelta(hours=5)
t2 = t2.replace(tzinfo = datetime.timezone(datetime.timedelta(hours=-5)))
@@ -108,14 +108,14 @@
def test_localtime_epoch_notz_daylight_true(self):
test.support.patch(self, time, 'daylight', True)
- t0 = datetime.datetime(1970, 1, 1)
+ t0 = datetime.datetime(1990, 1, 1)
t1 = utils.localtime(t0)
t2 = utils.localtime(t0.replace(tzinfo=None))
self.assertEqual(t1, t2)
def test_localtime_epoch_notz_daylight_false(self):
test.support.patch(self, time, 'daylight', False)
- t0 = datetime.datetime(1970, 1, 1)
+ t0 = datetime.datetime(1990, 1, 1)
t1 = utils.localtime(t0)
t2 = utils.localtime(t0.replace(tzinfo=None))
self.assertEqual(t1, t2)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list