Skip to content

Commit 69aea98

Browse files
renamed duplicated fixture
1 parent 0749634 commit 69aea98

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pandas/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ def indices(request):
405405

406406

407407
# Needed to generate cartesian product of indices
408-
indices2 = indices
408+
index_fixture2 = indices
409409

410410

411411
# ----------------------------------------------------------------

pandas/tests/indexes/test_setops.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ def test_union_same_types(indices):
2828
assert idx1.union(idx2).dtype == idx1.dtype
2929

3030

31-
def test_union_different_types(indices, indices2):
31+
def test_union_different_types(indices, index_fixture2):
3232
# This test only considers combinations of indices
3333
# GH 23525
34-
idx1, idx2 = indices, indices2
34+
idx1, idx2 = indices, index_fixture2
3535
type_pair = tuple(sorted([type(idx1), type(idx2)], key=lambda x: str(x)))
3636
if type_pair in COMPATIBLE_INCONSISTENT_PAIRS:
3737
pytest.xfail("This test only considers non compatible indexes.")

0 commit comments

Comments
 (0)