Skip to content

Commit 1fd46c8

Browse files
authored
TST: Refactor index setops test for xdist stability (#48010)
1 parent 5f66629 commit 1fd46c8

File tree

2 files changed

+16
-23
lines changed

2 files changed

+16
-23
lines changed

pandas/conftest.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -665,21 +665,6 @@ def index_flat(request):
665665
index_flat2 = index_flat
666666

667667

668-
@pytest.fixture(
669-
params=[
670-
key
671-
for key in indices_dict
672-
if not isinstance(indices_dict[key], MultiIndex) and indices_dict[key].is_unique
673-
]
674-
)
675-
def index_flat_unique(request):
676-
"""
677-
index_flat with uniqueness requirement.
678-
"""
679-
key = request.param
680-
return indices_dict[key].copy()
681-
682-
683668
@pytest.fixture(
684669
params=[
685670
key

pandas/tests/indexes/test_setops.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,13 @@ def test_symmetric_difference(self, index):
317317
(None, None, None),
318318
],
319319
)
320-
def test_corner_union(self, index_flat_unique, fname, sname, expected_name):
320+
def test_corner_union(self, index_flat, fname, sname, expected_name):
321321
# GH#9943, GH#9862
322322
# Test unions with various name combinations
323323
# Do not test MultiIndex or repeats
324-
index = index_flat_unique
324+
if not index_flat.is_unique:
325+
pytest.skip("Randomly generated index_flat was not unique.")
326+
index = index_flat
325327

326328
# Test copy.union(copy)
327329
first = index.copy().set_names(fname)
@@ -361,8 +363,10 @@ def test_corner_union(self, index_flat_unique, fname, sname, expected_name):
361363
(None, None, None),
362364
],
363365
)
364-
def test_union_unequal(self, index_flat_unique, fname, sname, expected_name):
365-
index = index_flat_unique
366+
def test_union_unequal(self, index_flat, fname, sname, expected_name):
367+
if not index_flat.is_unique:
368+
pytest.skip("Randomly generated index_flat was not unique.")
369+
index = index_flat
366370

367371
# test copy.union(subset) - need sort for unicode and string
368372
first = index.copy().set_names(fname)
@@ -381,10 +385,12 @@ def test_union_unequal(self, index_flat_unique, fname, sname, expected_name):
381385
(None, None, None),
382386
],
383387
)
384-
def test_corner_intersect(self, index_flat_unique, fname, sname, expected_name):
388+
def test_corner_intersect(self, index_flat, fname, sname, expected_name):
385389
# GH#35847
386390
# Test intersections with various name combinations
387-
index = index_flat_unique
391+
if not index_flat.is_unique:
392+
pytest.skip("Randomly generated index_flat was not unique.")
393+
index = index_flat
388394

389395
# Test copy.intersection(copy)
390396
first = index.copy().set_names(fname)
@@ -424,8 +430,10 @@ def test_corner_intersect(self, index_flat_unique, fname, sname, expected_name):
424430
(None, None, None),
425431
],
426432
)
427-
def test_intersect_unequal(self, index_flat_unique, fname, sname, expected_name):
428-
index = index_flat_unique
433+
def test_intersect_unequal(self, index_flat, fname, sname, expected_name):
434+
if not index_flat.is_unique:
435+
pytest.skip("Randomly generated index_flat was not unique.")
436+
index = index_flat
429437

430438
# test copy.intersection(subset) - need sort for unicode and string
431439
first = index.copy().set_names(fname)

0 commit comments

Comments
 (0)