Skip to content

Commit 91d67c6

Browse files
add parametrize for suffixes
1 parent daf22e0 commit 91d67c6

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

pandas/tests/reshape/merge/test_merge.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,10 +1459,15 @@ def test_merge_suffix(col1, col2, suffixes, expected_cols):
14591459
assert df.columns.tolist() == expected_cols
14601460

14611461

1462-
def test_merge_suffix_errors():
1462+
@pytest.mark.parametrize("suffixes", [
1463+
(None, None),
1464+
('', None),
1465+
(None, '')
1466+
])
1467+
def test_merge_suffix_errors(suffixes):
14631468
# 24819
14641469
a = pd.DataFrame({0: [1, 2, 3]})
14651470
b = pd.DataFrame({0: [4, 5, 6]})
14661471

14671472
with pytest.raises(ValueError, match="columns overlap but no suffix specified"):
1468-
a.merge(b, left_index=True, right_index=True, suffixes=(None, None))
1473+
a.merge(b, left_index=True, right_index=True, suffixes=suffixes)

0 commit comments

Comments
 (0)