From 66389bc5c67de290f19457ab171df8d069235756 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 18 Aug 2025 15:16:28 +0200 Subject: [PATCH] backend-test-utils: simplify MockSchedulerService aborts Signed-off-by: Patrik Oldsberg --- .../src/services/MockSchedulerService.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/backend-test-utils/src/services/MockSchedulerService.ts b/packages/backend-test-utils/src/services/MockSchedulerService.ts index b3269b84e3..750bee4c09 100644 --- a/packages/backend-test-utils/src/services/MockSchedulerService.ts +++ b/packages/backend-test-utils/src/services/MockSchedulerService.ts @@ -31,7 +31,7 @@ export class MockSchedulerService implements SchedulerService { SchedulerServiceTaskInvocationDefinition & SchedulerServiceTaskScheduleDefinition & { descriptor: SchedulerServiceTaskDescriptor; - abortControllers: AbortController[]; + abortControllers: AbortController; } >(); readonly #runningTasks = new Set(); @@ -91,7 +91,7 @@ export class MockSchedulerService implements SchedulerService { scope: task.scope ?? 'global', settings: { version: 1 }, }, - abortControllers: [], + abortControllers: new AbortController(), }); } @@ -105,9 +105,7 @@ export class MockSchedulerService implements SchedulerService { } this.#runningTasks.add(id); try { - const abortController = new AbortController(); - task.abortControllers.push(abortController); - await task.fn(abortController.signal); + await task.fn(task.abortControllers.signal); this.#deferredTaskCompletions.get(id)?.resolve(); } catch (error) { this.#deferredTaskCompletions.get(id)?.reject(error); @@ -153,9 +151,7 @@ export class MockSchedulerService implements SchedulerService { async #shutdownAllTasks() { for (const task of this.#tasks.values()) { - for (const abortController of task.abortControllers) { - abortController.abort(); - } + task.abortControllers.abort(); } }