Skip to content

Commit e303e26

Browse files
committed
TST: more tseries reorg
1 parent f593ee8 commit e303e26

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

pandas/tests/indexes/datetimes/test_ops.py

+1-13
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
import pandas.util.testing as tm
88
from pandas.core.common import PerformanceWarning
99
from pandas.tseries.index import cdate_range
10-
from pandas.tseries.frequencies import get_offset, to_offset
1110
from pandas import (DatetimeIndex, PeriodIndex, Series, Timestamp, Timedelta,
1211
date_range, TimedeltaIndex, _np_version_under1p10, Index,
1312
datetime, Float64Index, offsets, bdate_range)
14-
from pandas.tseries.offsets import (BMonthEnd, CDay, BDay, Milli, MonthBegin,
15-
Micro)
13+
from pandas.tseries.offsets import BMonthEnd, CDay, BDay
1614
from pandas.tests.test_base import Ops
1715

1816

@@ -913,16 +911,6 @@ def test_equals(self):
913911
self.assertFalse(idx.equals(list(idx3)))
914912
self.assertFalse(idx.equals(pd.Series(idx3)))
915913

916-
def test_ms_vs_MS(self):
917-
left = get_offset('ms')
918-
right = get_offset('MS')
919-
self.assertEqual(left, Milli())
920-
self.assertEqual(right, MonthBegin())
921-
922-
def test_rule_aliases(self):
923-
rule = to_offset('10us')
924-
self.assertEqual(rule, Micro(10))
925-
926914

927915
class TestDateTimeIndexToJulianDate(tm.TestCase):
928916

pandas/tests/tseries/test_frequencies.py

+12
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,18 @@ def test_anchored_shortcuts(self):
247247
frequencies.to_offset(invalid_anchor)
248248

249249

250+
def test_ms_vs_MS():
251+
left = frequencies.get_offset('ms')
252+
right = frequencies.get_offset('MS')
253+
assert left == offsets.Milli()
254+
assert right == offsets.MonthBegin()
255+
256+
257+
def test_rule_aliases():
258+
rule = frequencies.to_offset('10us')
259+
assert rule == offsets.Micro(10)
260+
261+
250262
def test_get_rule_month():
251263
result = frequencies._get_rule_month('W')
252264
assert (result == 'DEC')

0 commit comments

Comments
 (0)