From 460c18f129242f45f2a9edb4bd29daab6ad172b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 24 Mar 2022 15:19:37 +0100
Subject: [PATCH] fix the PluginTaskManagerImpl race condition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../src/tasks/PluginTaskSchedulerImpl.test.ts   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.test.ts b/packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.test.ts
index 95a9729018..3018ffb4ab 100644
--- a/packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.test.ts
+++ b/packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.test.ts
@@ -24,6 +24,14 @@ import { ConflictError, NotFoundError } from '@backstage/errors';
 
 jest.useFakeTimers();
 
+function defer() {
+  let resolve = () => {};
+  const promise = new Promise<void>(_resolve => {
+    resolve = _resolve;
+  });
+  return { promise, resolve };
+}
+
 describe('PluginTaskManagerImpl', () => {
   const databases = TestDatabases.create({
     ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
@@ -133,14 +141,19 @@ describe('PluginTaskManagerImpl', () => {
       async databaseId => {
         const { manager } = await init(databaseId);
 
-        const fn = jest.fn();
+        const { promise, resolve } = defer();
+
         await manager.scheduleTask({
           id: 'task1',
           timeout: Duration.fromMillis(5000),
           frequency: Duration.fromObject({ years: 1 }),
-          fn,
+          fn: async () => {
+            resolve();
+            await new Promise(r => setTimeout(r, 20000));
+          },
         });
 
+        await promise;
         await expect(() => manager.triggerTask('task1')).rejects.toThrow(
           ConflictError,
         );