Skip to content

Commit 4f06b80

Browse files
committed
update test
1 parent 5dac53e commit 4f06b80

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Diff for: pandas/tests/arithmetic/test_period.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,12 @@ def test_period_add_timestamp_raises(self, box_with_array):
13621362
arr + ts
13631363
with pytest.raises(TypeError, match=msg):
13641364
ts + arr
1365-
msg = "cannot add PeriodArray and DatetimeArray"
1365+
if box_with_array is pd.DataFrame:
1366+
# TODO: before implementing resolution-inference we got the same
1367+
# message with DataFrame and non-DataFrame. Why did that change?
1368+
msg = "cannot add PeriodArray and Timestamp"
1369+
else:
1370+
msg = "cannot add PeriodArray and DatetimeArray"
13661371
with pytest.raises(TypeError, match=msg):
13671372
arr + Series([ts])
13681373
with pytest.raises(TypeError, match=msg):

0 commit comments

Comments
 (0)