From 7520246d90eab8e1522556baca0e633d008e9b6a Mon Sep 17 00:00:00 2001 From: Garrett-R Date: Mon, 19 Jan 2015 01:16:30 -0800 Subject: [PATCH] BUG: Fixes #9281: fixes to tseries.tests.test_tslib.TestTimestamp The last tests of both `test_now` and `test_today` were passing for anyone with a timezone of UTC-5 or greater (but failed, for example, for people in US/Pacific). The test was not testing what the original author meant it to (which is that the times are very close together) so I added abs(.) around the Timedeltas and also fixed the errant test. --- pandas/tseries/tests/test_tslib.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pandas/tseries/tests/test_tslib.py b/pandas/tseries/tests/test_tslib.py index 945458de22d2c..8140d289f8c8a 100644 --- a/pandas/tseries/tests/test_tslib.py +++ b/pandas/tseries/tests/test_tslib.py @@ -338,9 +338,11 @@ def test_now(self): # Check that the delta between the times is less than 1s (arbitrarily small) delta = Timedelta(seconds=1) - self.assertTrue((ts_from_method - ts_from_string) < delta) - self.assertTrue((ts_from_method_tz - ts_from_string_tz) < delta) - self.assertTrue((ts_from_string_tz.tz_localize(None) - ts_from_string) < delta) + self.assertTrue(abs(ts_from_method - ts_from_string) < delta) + self.assertTrue(abs(ts_datetime - ts_from_method) < delta) + self.assertTrue(abs(ts_from_method_tz - ts_from_string_tz) < delta) + self.assertTrue(abs(ts_from_string_tz.tz_localize(None) + - ts_from_method_tz.tz_localize(None)) < delta) def test_today(self): @@ -353,10 +355,11 @@ def test_today(self): # Check that the delta between the times is less than 1s (arbitrarily small) delta = Timedelta(seconds=1) - self.assertTrue((ts_from_method - ts_from_string) < delta) - self.assertTrue((ts_datetime - ts_from_method) < delta) - self.assertTrue((ts_datetime - ts_from_method) < delta) - self.assertTrue((ts_from_string_tz.tz_localize(None) - ts_from_string) < delta) + self.assertTrue(abs(ts_from_method - ts_from_string) < delta) + self.assertTrue(abs(ts_datetime - ts_from_method) < delta) + self.assertTrue(abs(ts_from_method_tz - ts_from_string_tz) < delta) + self.assertTrue(abs(ts_from_string_tz.tz_localize(None) + - ts_from_method_tz.tz_localize(None)) < delta) class TestDatetimeParsingWrappers(tm.TestCase): def test_does_not_convert_mixed_integer(self):