summaryrefslogtreecommitdiff
path: root/Lib/test
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-04 23:57:25 +0200
committerVictor Stinner <victor.stinner@gmail.com>2015-09-04 23:57:25 +0200
commitadfefa527a32e711c1bea9c1ac32c20e9cce0660 (patch)
tree8e03b6d95d1f6f32780d8535aa5b60d411d0646f /Lib/test
parent19bbb9af678040e8963edfcfdc30e9f87b106fb9 (diff)
downloadcpython-git-adfefa527a32e711c1bea9c1ac32c20e9cce0660.tar.gz
Issue #23517: Fix implementation of the ROUND_HALF_UP rounding mode in
datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp(). microseconds sign should be kept before rounding.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/datetimetester.py12
-rw-r--r--Lib/test/test_time.py13
2 files changed, 17 insertions, 8 deletions
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index f516434bd6..58873af7f6 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -668,6 +668,8 @@ class TestTimeDelta(HarmlessMixedComparison, unittest.TestCase):
eq(td(milliseconds=-0.6/1000), td(microseconds=-1))
eq(td(seconds=0.5/10**6), td(microseconds=1))
eq(td(seconds=-0.5/10**6), td(microseconds=-1))
+ eq(td(seconds=1/2**7), td(microseconds=7813))
+ eq(td(seconds=-1/2**7), td(microseconds=-7813))
# Rounding due to contributions from more than one field.
us_per_hour = 3600e6
@@ -1842,8 +1844,8 @@ class TestDateTime(TestDate):
18000 + 3600 + 2*60 + 3 + 4*1e-6)
def test_microsecond_rounding(self):
- for fts in [self.theclass.fromtimestamp,
- self.theclass.utcfromtimestamp]:
+ for fts in (datetime.fromtimestamp,
+ self.theclass.utcfromtimestamp):
zero = fts(0)
self.assertEqual(zero.second, 0)
self.assertEqual(zero.microsecond, 0)
@@ -1874,6 +1876,12 @@ class TestDateTime(TestDate):
t = fts(0.9999999)
self.assertEqual(t.second, 1)
self.assertEqual(t.microsecond, 0)
+ t = fts(1/2**7)
+ self.assertEqual(t.second, 0)
+ self.assertEqual(t.microsecond, 7813)
+ t = fts(-1/2**7)
+ self.assertEqual(t.second, 59)
+ self.assertEqual(t.microsecond, 992187)
def test_insane_fromtimestamp(self):
# It's possible that some platform maps time_t to double,
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 590425ae90..75ab666faa 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -655,7 +655,7 @@ class TestPytime(unittest.TestCase):
pytime_object_to_time_t, invalid, rnd)
@support.cpython_only
- def test_timespec(self):
+ def test_object_to_timespec(self):
from _testcapi import pytime_object_to_timespec
# Conversion giving the same result for all rounding methods
@@ -666,7 +666,7 @@ class TestPytime(unittest.TestCase):
(-1, (-1, 0)),
# float
- (-1.2, (-2, 800000000)),
+ (-1/2**7, (-1, 992187500)),
(-1.0, (-1, 0)),
(-1e-9, (-1, 999999999)),
(1e-9, (0, 1)),
@@ -693,7 +693,7 @@ class TestPytime(unittest.TestCase):
(1.1234567890, (1, 123456789), FLOOR),
(1.1234567899, (1, 123456789), FLOOR),
- (-1.1234567890, (-2, 876543211), FLOOR),
+ (-1.1234567890, (-2, 876543210), FLOOR),
(-1.1234567891, (-2, 876543210), FLOOR),
# Round towards infinity (+inf)
(1.1234567890, (1, 123456790), CEILING),
@@ -1155,7 +1155,7 @@ class TestOldPyTime(unittest.TestCase):
self.assertRaises(OverflowError,
pytime_object_to_time_t, invalid, rnd)
- def test_timeval(self):
+ def test_object_to_timeval(self):
from _testcapi import pytime_object_to_timeval
# Conversion giving the same result for all rounding methods
@@ -1167,7 +1167,8 @@ class TestOldPyTime(unittest.TestCase):
# float
(-1.0, (-1, 0)),
- (-1.2, (-2, 800000)),
+ (1/2**6, (0, 15625)),
+ (-1/2**6, (-1, 984375)),
(-1e-6, (-1, 999999)),
(1e-6, (0, 1)),
):
@@ -1225,7 +1226,7 @@ class TestOldPyTime(unittest.TestCase):
(-1.0, (-1, 0)),
(-1e-9, (-1, 999999999)),
(1e-9, (0, 1)),
- (-1.2, (-2, 800000000)),
+ (-1/2**9, (-1, 998046875)),
):
with self.subTest(obj=obj, round=rnd, timespec=timespec):
self.assertEqual(pytime_object_to_timespec(obj, rnd),