Skip to content

Commit cf4168a

Browse files
committed
Change suffixes field from list to tuple in test_join file
1 parent 69ba450 commit cf4168a

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

pandas/tests/reshape/merge/test_join.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def test_inner_join(self):
162162
_check_join(self.df, self.df2, joined_both, ["key1", "key2"], how="inner")
163163

164164
def test_handle_overlap(self):
165-
joined = merge(self.df, self.df2, on="key2", suffixes=[".foo", ".bar"])
165+
joined = merge(self.df, self.df2, on="key2", suffixes=(".foo", ".bar"))
166166

167167
assert "key1.foo" in joined
168168
assert "key1.bar" in joined
@@ -173,7 +173,7 @@ def test_handle_overlap_arbitrary_key(self):
173173
self.df2,
174174
left_on="key2",
175175
right_on="key1",
176-
suffixes=[".foo", ".bar"],
176+
suffixes=(".foo", ".bar"),
177177
)
178178
assert "key1.foo" in joined
179179
assert "key2.bar" in joined

pandas/tests/reshape/merge/test_merge.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,11 +2056,7 @@ def test_merge_duplicate_suffix(how, expected):
20562056

20572057
@pytest.mark.parametrize(
20582058
"col1, col2, suffixes",
2059-
[
2060-
("a", "a", (None, None)),
2061-
("a", "a", ("", None)),
2062-
(0, 0, (None, "")),
2063-
],
2059+
[("a", "a", (None, None)), ("a", "a", ("", None)), (0, 0, (None, "")),],
20642060
)
20652061
def test_merge_suffix_error(col1, col2, suffixes):
20662062
# issue: 24782

0 commit comments

Comments
 (0)