Skip to content

Commit 129b7cb

Browse files
authored
Fix tests that disable the shuffle extension (#7883)
1 parent 2d4ff46 commit 129b7cb

File tree

5 files changed

+24
-5
lines changed

5 files changed

+24
-5
lines changed

distributed/http/scheduler/tests/test_semaphore_http.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ async def test_prometheus(c, s, a, b):
7272

7373

7474
@gen_cluster(
75-
client=True, clean_kwargs={"threads": False}, scheduler_kwargs={"extensions": {}}
75+
client=True,
76+
clean_kwargs={"threads": False},
77+
scheduler_kwargs={"extensions": {}},
78+
worker_kwargs={"extensions": {}},
7679
)
7780
async def test_prometheus_without_semaphore_extension(c, s, a, b):
7881
pytest.importorskip("prometheus_client")

distributed/http/scheduler/tests/test_stealing_http.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ async def fetch_metrics_by_cost_multipliers():
9595

9696

9797
@gen_cluster(
98-
client=True, clean_kwargs={"threads": False}, scheduler_kwargs={"extensions": {}}
98+
client=True,
99+
clean_kwargs={"threads": False},
100+
scheduler_kwargs={"extensions": {}},
101+
worker_kwargs={"extensions": {}},
99102
)
100103
async def test_prometheus_without_stealing_extension(c, s, a, b):
101104
pytest.importorskip("prometheus_client")

distributed/tests/test_active_memory_manager.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,11 @@ async def test_RetireWorker_amm_on_off(c, s, a, b, start_amm):
759759
assert "x" in b.data
760760

761761

762-
@gen_cluster(client=True, scheduler_kwargs={"extensions": {}})
762+
@gen_cluster(
763+
client=True,
764+
scheduler_kwargs={"extensions": {}},
765+
worker_kwargs={"extensions": {}},
766+
)
763767
async def test_RetireWorker_no_extension(c, s, a, b):
764768
"""retire_workers must work when the AMM extension is not loaded"""
765769
futures = await c.scatter({"x": 1}, workers=[a.address])

distributed/tests/test_spans.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,12 @@ async def test_multiple_tags(c, s, a, b):
103103
assert s.extensions["spans"].spans_search_by_tag.keys() == {"foo", "bar"}
104104

105105

106-
@gen_cluster(client=True, scheduler_kwargs={"extensions": {}})
106+
@gen_cluster(
107+
client=True,
108+
nthreads=[("", 1)],
109+
scheduler_kwargs={"extensions": {}},
110+
worker_kwargs={"extensions": {}},
111+
)
107112
async def test_no_extension(c, s, a, b):
108113
x = c.submit(inc, 1, key="x")
109114
assert await x == 2

distributed/tests/test_worker_client.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,11 @@ def test_secede_without_stealing_issue_1262():
277277

278278
# run the loop as an inner function so all workers are closed
279279
# and exceptions can be examined
280-
@gen_cluster(client=True, scheduler_kwargs={"extensions": {}})
280+
@gen_cluster(
281+
client=True,
282+
scheduler_kwargs={"extensions": {}},
283+
worker_kwargs={"extensions": {}},
284+
)
281285
async def secede_test(c, s, a, b):
282286
def func(x):
283287
with worker_client() as wc:

0 commit comments

Comments
 (0)