Skip to content

Commit 2d4e143

Browse files
author
Albert Villanova del Moral
committed
Fix pytest fixture name collision
1 parent 64e86a4 commit 2d4e143

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pandas/tests/tools/test_merge.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1358,12 +1358,12 @@ def test_dtype_on_merged_different(self, change, how, left, right):
13581358

13591359

13601360
@pytest.fixture
1361-
def left():
1361+
def left_df():
13621362
return DataFrame({'a': [20, 10, 0]}, index=[2, 1, 0])
13631363

13641364

13651365
@pytest.fixture
1366-
def right():
1366+
def right_df():
13671367
return DataFrame({'b': [300, 100, 200]}, index=[3, 1, 2])
13681368

13691369

@@ -1395,9 +1395,9 @@ class TestMergeOnIndexes(object):
13951395
('outer', True, DataFrame({'a': [0, 10, 20, np.nan],
13961396
'b': [np.nan, 100, 200, 300]},
13971397
index=[0, 1, 2, 3]))])
1398-
def test_merge_on_indexes(self, left, right, how, sort, expected):
1398+
def test_merge_on_indexes(self, left_df, right_df, how, sort, expected):
13991399

1400-
result = pd.merge(left, right,
1400+
result = pd.merge(left_df, right_df,
14011401
left_index=True,
14021402
right_index=True,
14031403
how=how,

0 commit comments

Comments
 (0)