Skip to content

Commit bf3a9c6

Browse files
committed
TST: fixup test in tseries/test_offsets for test_datetimeindex (was using a current date)
1 parent 2266194 commit bf3a9c6

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

pandas/tseries/tests/test_offsets.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from pandas.core.datetools import (
1212
bday, BDay, cday, CDay, BQuarterEnd, BMonthEnd,
13-
CBMonthEnd, CBMonthBegin,
13+
CBMonthEnd, CBMonthBegin,
1414
BYearEnd, MonthEnd, MonthBegin, BYearBegin,
1515
QuarterBegin, BQuarterBegin, BMonthBegin, DateOffset, Week,
1616
YearBegin, YearEnd, Hour, Minute, Second, Day, Micro, Milli, Nano, Easter,
@@ -601,7 +601,7 @@ class TestCustomBusinessMonthEnd(TestBase):
601601
def setUp(self):
602602
self.d = datetime(2008, 1, 1)
603603

604-
_skip_if_no_cday()
604+
_skip_if_no_cday()
605605
self.offset = CBMonthEnd()
606606
self.offset2 = CBMonthEnd(2)
607607

@@ -636,14 +636,14 @@ def testSub(self):
636636
self.assertRaises(Exception, off.__sub__, self.d)
637637
self.assertEqual(2 * off - off, off)
638638

639-
self.assertEqual(self.d - self.offset2,
639+
self.assertEqual(self.d - self.offset2,
640640
self.d + CBMonthEnd(-2))
641641

642642
def testRSub(self):
643643
self.assertEqual(self.d - self.offset2, (-self.offset2).apply(self.d))
644644

645645
def testMult1(self):
646-
self.assertEqual(self.d + 10 * self.offset,
646+
self.assertEqual(self.d + 10 * self.offset,
647647
self.d + CBMonthEnd(10))
648648

649649
def testMult2(self):
@@ -748,10 +748,8 @@ def test_holidays(self):
748748
self.assertEqual(dt + bm_offset,datetime(2012,1,30))
749749
self.assertEqual(dt + 2*bm_offset,datetime(2012,2,27))
750750

751-
def test_datetimindex(self):
751+
def test_datetimeindex(self):
752752
from pandas.tseries.holiday import USFederalHolidayCalendar
753-
self.assertEqual(DatetimeIndex(start='2012',end='2013',freq='CBM').tolist()[0],
754-
datetime(2012,4,30))
755753
self.assertEqual(DatetimeIndex(start='20120101',end='20130101',freq=CBMonthEnd(calendar=USFederalHolidayCalendar())).tolist()[0],
756754
datetime(2012,1,31))
757755

@@ -762,7 +760,7 @@ class TestCustomBusinessMonthBegin(TestBase):
762760
def setUp(self):
763761
self.d = datetime(2008, 1, 1)
764762

765-
_skip_if_no_cday()
763+
_skip_if_no_cday()
766764
self.offset = CBMonthBegin()
767765
self.offset2 = CBMonthBegin(2)
768766

@@ -797,14 +795,14 @@ def testSub(self):
797795
self.assertRaises(Exception, off.__sub__, self.d)
798796
self.assertEqual(2 * off - off, off)
799797

800-
self.assertEqual(self.d - self.offset2,
798+
self.assertEqual(self.d - self.offset2,
801799
self.d + CBMonthBegin(-2))
802800

803801
def testRSub(self):
804802
self.assertEqual(self.d - self.offset2, (-self.offset2).apply(self.d))
805803

806804
def testMult1(self):
807-
self.assertEqual(self.d + 10 * self.offset,
805+
self.assertEqual(self.d + 10 * self.offset,
808806
self.d + CBMonthBegin(10))
809807

810808
def testMult2(self):
@@ -2871,3 +2869,4 @@ def test_str_for_named_is_name(self):
28712869
if __name__ == '__main__':
28722870
nose.runmodule(argv=[__file__, '-vvs', '-x', '--pdb', '--pdb-failure'],
28732871
exit=False)
2872+

0 commit comments

Comments
 (0)