Skip to content

Commit 2b3a9b1

Browse files
authored
TST: unhoused test_offsets fn to custom business hour (#27045) (#43218)
1 parent 44e8822 commit 2b3a9b1

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

pandas/tests/tseries/offsets/test_custom_business_hour.py

+18
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,21 @@ def test_us_federal_holiday_with_datetime(self):
308308
result = t0 + bhour_us * 8
309309
expected = Timestamp("2014-01-21 15:00:00")
310310
assert result == expected
311+
312+
313+
@pytest.mark.parametrize(
314+
"weekmask, expected_time, mult",
315+
[
316+
["Mon Tue Wed Thu Fri Sat", "2018-11-10 09:00:00", 10],
317+
["Tue Wed Thu Fri Sat", "2018-11-13 08:00:00", 18],
318+
],
319+
)
320+
def test_custom_businesshour_weekmask_and_holidays(weekmask, expected_time, mult):
321+
# GH 23542
322+
holidays = ["2018-11-09"]
323+
bh = CustomBusinessHour(
324+
start="08:00", end="17:00", weekmask=weekmask, holidays=holidays
325+
)
326+
result = Timestamp("2018-11-08 08:00") + mult * bh
327+
expected = Timestamp(expected_time)
328+
assert result == expected

pandas/tests/tseries/offsets/test_offsets.py

-18
Original file line numberDiff line numberDiff line change
@@ -795,21 +795,3 @@ def test_dateoffset_immutable(attribute):
795795
msg = "DateOffset objects are immutable"
796796
with pytest.raises(AttributeError, match=msg):
797797
setattr(offset, attribute, 5)
798-
799-
800-
@pytest.mark.parametrize(
801-
"weekmask, expected_time, mult",
802-
[
803-
["Mon Tue Wed Thu Fri Sat", "2018-11-10 09:00:00", 10],
804-
["Tue Wed Thu Fri Sat", "2018-11-13 08:00:00", 18],
805-
],
806-
)
807-
def test_custom_businesshour_weekmask_and_holidays(weekmask, expected_time, mult):
808-
# GH 23542
809-
holidays = ["2018-11-09"]
810-
bh = CustomBusinessHour(
811-
start="08:00", end="17:00", weekmask=weekmask, holidays=holidays
812-
)
813-
result = Timestamp("2018-11-08 08:00") + mult * bh
814-
expected = Timestamp(expected_time)
815-
assert result == expected

0 commit comments

Comments
 (0)