Skip to content

Commit 102dc19

Browse files
committed
Fix tests
1 parent 54fdd21 commit 102dc19

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

distributed/tests/test_scheduler.py

+12-9
Original file line numberDiff line numberDiff line change
@@ -2788,24 +2788,26 @@ async def test_retire_workers_bad_params(c, s, a, b):
27882788
@gen_cluster(
27892789
client=True, config={"distributed.scheduler.default-task-durations": {"inc": 100}}
27902790
)
2791-
async def test_get_task_duration(c, s, a, b):
2791+
async def test_get_prefix_duration(c, s, a, b):
27922792
future = c.submit(inc, 1)
27932793
await future
27942794
assert 10 < s.task_prefixes["inc"].duration_average < 100
27952795

27962796
ts_pref1 = s.new_task("inc-abcdefab", None, "released")
2797-
assert 10 < s.get_task_duration(ts_pref1) < 100
2797+
assert 10 < s._get_prefix_duration(ts_pref1.prefix) < 100
27982798

2799+
extension = s.extensions["stealing"]
27992800
# make sure get_task_duration adds TaskStates to unknown dict
2800-
assert len(s.unknown_durations) == 0
2801+
assert len(extension.unknown_durations) == 0
28012802
x = c.submit(slowinc, 1, delay=0.5)
28022803
while len(s.tasks) < 3:
28032804
await asyncio.sleep(0.01)
28042805

28052806
ts = s.tasks[x.key]
2806-
assert s.get_task_duration(ts) == 0.5 # default
2807-
assert len(s.unknown_durations) == 1
2808-
assert len(s.unknown_durations["slowinc"]) == 1
2807+
assert s._get_prefix_duration(ts.prefix) == 0.5 # default
2808+
2809+
assert len(extension.unknown_durations) == 1
2810+
assert len(extension.unknown_durations["slowinc"]) == 1
28092811

28102812

28112813
@gen_cluster(client=True)
@@ -3338,10 +3340,11 @@ async def test_unknown_task_duration_config(client, s, a, b):
33383340
future = client.submit(slowinc, 1)
33393341
while not s.tasks:
33403342
await asyncio.sleep(0.001)
3341-
assert sum(s.get_task_duration(ts) for ts in s.tasks.values()) == 3600
3342-
assert len(s.unknown_durations) == 1
3343+
assert sum(s._get_prefix_duration(ts.prefix) for ts in s.tasks.values()) == 3600
3344+
extension = s.extensions["stealing"]
3345+
assert len(extension.unknown_durations) == 1
33433346
await wait(future)
3344-
assert len(s.unknown_durations) == 0
3347+
assert len(extension.unknown_durations) == 0
33453348

33463349

33473350
@gen_cluster()

distributed/tests/test_steal.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ async def test_eventually_steal_unknown_functions(c, s, a, b):
278278
slowinc, range(10), delay=0.1, workers=a.address, allow_other_workers=True
279279
)
280280
await wait(futures)
281-
assert not s.unknown_durations
281+
extension = s.extensions["stealing"]
282+
assert not extension.unknown_durations
282283
assert len(a.data) >= 3, [len(a.data), len(b.data)]
283284
assert len(b.data) >= 3, [len(a.data), len(b.data)]
284285

distributed/tests/test_worker_state_machine.py

-2
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ def f(arg):
379379
who_has={"y": ["w1"]},
380380
nbytes={"y": 123},
381381
priority=(0,),
382-
duration=123.45,
383382
run_spec=(f, "arg", {}),
384383
resource_restrictions={},
385384
actor=False,
@@ -422,7 +421,6 @@ def test_computetask_dummy():
422421
who_has={},
423422
nbytes={},
424423
priority=(0,),
425-
duration=1.0,
426424
run_spec=ComputeTaskEvent.dummy_runspec("x"),
427425
resource_restrictions={},
428426
actor=False,

0 commit comments

Comments
 (0)