Skip to content

Commit 95bf4af

Browse files
Fix controller unit test timing (#1936)
1 parent 6750969 commit 95bf4af

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

tests/unit_test/apis/impl/controller_test.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ def test_task_done_cb(self, method, num_clients, task_name, input_data, cb, expe
691691
)
692692
if task_complete == "timeout":
693693
time.sleep(timeout)
694+
controller._check_tasks()
694695
assert task.completion_status == TaskCompletionStatus.TIMEOUT
695696
elif task_complete == "cancel":
696697
controller.cancel_task(task)
@@ -1257,7 +1258,7 @@ def test_task_exit_quickly_when_all_responses_received(self, method, min_respons
12571258
client=client, task_name="__test_task", task_id=client_task_id, result=result, fl_ctx=fl_ctx
12581259
)
12591260

1260-
time.sleep(0.5)
1261+
controller._check_tasks()
12611262
assert controller.get_num_standing_tasks() == 0
12621263
assert task.completion_status == TaskCompletionStatus.OK
12631264
launch_thread.join()
@@ -1317,22 +1318,22 @@ def _process_task_request_test_cases():
13171318
client_names = [c.name for c in clients]
13181319

13191320
dynamic_targets_cases = [
1320-
(clients[1:], clients[0], True, 1, 0, False, [clients[1].name, clients[2].name, clients[0].name]),
1321-
(clients[1:], clients[1], True, 1, 0, True, client_names[1:]),
1322-
(clients[1:], clients[2], True, 1, 0, False, client_names[1:]),
1323-
([clients[0]], clients[1], True, 1, 0, False, [clients[0].name, clients[1].name]),
1321+
(clients[1:], clients[0], True, 2, 0, False, [clients[1].name, clients[2].name, clients[0].name]),
1322+
(clients[1:], clients[1], True, 2, 0, True, client_names[1:]),
1323+
(clients[1:], clients[2], True, 2, 0, False, client_names[1:]),
1324+
([clients[0]], clients[1], True, 2, 0, False, [clients[0].name, clients[1].name]),
13241325
([clients[0]], clients[1], True, 1, 2, False, [clients[0].name]),
13251326
([clients[0], clients[0]], clients[0], True, 1, 0, True, [clients[0].name, clients[0].name]),
13261327
(None, clients[0], True, 1, 0, True, [clients[0].name]),
13271328
]
13281329

13291330
static_targets_cases = [
1330-
(clients[1:], clients[0], False, 1, 0, False, client_names[1:]),
1331-
(clients[1:], clients[1], False, 1, 0, True, client_names[1:]),
1332-
(clients[1:], clients[2], False, 1, 0, False, client_names[1:]),
1333-
(clients[1:], clients[0], False, 1, 2, False, client_names[1:]),
1334-
(clients[1:], clients[1], False, 1, 2, True, client_names[1:]),
1335-
(clients[1:], clients[2], False, 1, 2, True, client_names[1:]),
1331+
(clients[1:], clients[0], False, 2, 0, False, client_names[1:]),
1332+
(clients[1:], clients[1], False, 2, 0, True, client_names[1:]),
1333+
(clients[1:], clients[2], False, 2, 0, False, client_names[1:]),
1334+
(clients[1:], clients[0], False, 1, 1.5, False, client_names[1:]),
1335+
(clients[1:], clients[1], False, 1, 1.5, True, client_names[1:]),
1336+
(clients[1:], clients[2], False, 1, 1.5, True, client_names[1:]),
13361337
]
13371338

13381339
return dynamic_targets_cases + static_targets_cases

0 commit comments

Comments
 (0)