Skip to content

Commit c377804

Browse files
pre-commit-ci[bot]Farsidetfs
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 6ab7165 commit c377804

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pandas/tests/reshape/merge/test_merge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,8 +3066,8 @@ def test_merge_for_suffix_collisions():
30663066
# GH#61402
30673067
# Case 1: suffixes=("_dup", "") test collision
30683068
df1 = DataFrame({"col1": [1], "col2": [2]})
3069-
df2 = DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})
3070-
with pytest.raises(MergeError, match="duplicate columns"):
3069+
df2 = DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})
3070+
with pytest.raises(MergeError, match="duplicate columns"):
30713071
merge(df1, df2, on="col1", suffixes=("_dup", ""))
30723072

30733073
# Case 2: suffixes=("", "_dup") test collision

0 commit comments

Comments
 (0)