Skip to content

Commit 3e5b239

Browse files
committed
update test error messages for merge type errors
1 parent 42bfbda commit 3e5b239

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

pandas/tests/frame/methods/test_join.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,7 @@ def test_join_index(float_frame):
277277
tm.assert_index_equal(joined.index, float_frame.index.sort_values())
278278
tm.assert_index_equal(joined.columns, expected_columns)
279279

280-
join_msg = (
281-
"'foo' is not a valid Merge type "
282-
"('left', 'right', 'inner', 'outer', 'cross', 'asof')"
283-
)
280+
join_msg = "'foo' is not a valid Merge type: left, right, inner, outer, cross, asof"
284281
with pytest.raises(ValueError, match=re.escape(join_msg)):
285282
f.join(f2, how="foo")
286283

pandas/tests/reshape/merge/test_merge.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,10 +1464,7 @@ def test_merge_how_validation(self):
14641464
data2 = DataFrame(
14651465
np.arange(20).reshape((5, 4)) + 1, columns=["a", "b", "x", "y"]
14661466
)
1467-
msg = (
1468-
"'full' is not a valid Merge type "
1469-
"('left', 'right', 'inner', 'outer', 'cross', 'asof')"
1470-
)
1467+
msg = "'full' is not a valid Merge type: left, right, inner, outer, cross, asof"
14711468
with pytest.raises(ValueError, match=re.escape(msg)):
14721469
data1.merge(data2, how="full")
14731470

0 commit comments

Comments
 (0)