Skip to content

Commit a755775

Browse files
committed
make the test separate
1 parent b501545 commit a755775

File tree

1 file changed

+34
-3
lines changed

1 file changed

+34
-3
lines changed

pandas/tests/reshape/merge/test_merge.py

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,8 +2149,6 @@ def test_merge_index_types(index):
21492149
(None, None, None, True, True, "B"),
21502150
(None, ["outer", "inner"], None, False, True, "B"),
21512151
(None, None, ["outer", "inner"], True, False, "B"),
2152-
(["outer", "inner"], None, None, False, False, ("B", "C")),
2153-
(None, None, ["outer", "inner"], True, False, ("B", "C")),
21542152
(["outer", "inner"], None, None, False, False, None),
21552153
(None, None, None, True, True, None),
21562154
(None, ["outer", "inner"], None, False, True, None),
@@ -2169,7 +2167,7 @@ def test_merge_series(on, left_on, right_on, left_index, right_index, nm):
21692167
name=nm,
21702168
)
21712169
expected = DataFrame(
2172-
{"A": [2, 4], nm: [1, 3]},
2170+
{"A": [2, 4], "B": [1, 3]},
21732171
index=MultiIndex.from_product([["a", "b"], [1]], names=["outer", "inner"]),
21742172
)
21752173
if nm is not None:
@@ -2197,6 +2195,39 @@ def test_merge_series(on, left_on, right_on, left_index, right_index, nm):
21972195
)
21982196

21992197

2198+
@pytest.mark.parametrize(
2199+
"on,left_on,right_on,left_index,right_index,name",
2200+
[
2201+
(["outer", "inner"], None, None, False, False, ("B", "C")),
2202+
(None, None, ["outer", "inner"], True, False, ("B", "C")),
2203+
],
2204+
)
2205+
def test_merge_series_multilevel(on, left_on, right_on, left_index, right_index, name):
2206+
a = DataFrame(
2207+
{"A": [1, 2, 3, 4]},
2208+
index=MultiIndex.from_product([["a", "b"], [0, 1]], names=["outer", "inner"]),
2209+
)
2210+
b = Series(
2211+
[1, 2, 3, 4],
2212+
index=MultiIndex.from_product([["a", "b"], [1, 2]], names=["outer", "inner"]),
2213+
name=name,
2214+
)
2215+
expected = DataFrame(
2216+
{"A": [2, 4], name: [1, 3]},
2217+
index=MultiIndex.from_product([["a", "b"], [1]], names=["outer", "inner"]),
2218+
)
2219+
result = merge(
2220+
a,
2221+
b,
2222+
on=on,
2223+
left_on=left_on,
2224+
right_on=right_on,
2225+
left_index=left_index,
2226+
right_index=right_index,
2227+
)
2228+
tm.assert_frame_equal(result, expected)
2229+
2230+
22002231
@pytest.mark.parametrize(
22012232
"col1, col2, kwargs, expected_cols",
22022233
[

0 commit comments

Comments
 (0)