backend-app-api,backend-test-api: hook up shutdown hook to stop method

Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

packages/backend-test-utils/src/next/wiring/TestBackend.test.ts

@@ -19,6 +19,7 @@ import {
   createExtensionPoint,
   createServiceFactory,
   createServiceRef,
+  lifecycleServiceRef,
 } from '@backstage/backend-plugin-api';
 import { startTestBackend } from './TestBackend';
 
@@ -31,7 +32,7 @@ describe('TestBackend', () => {
     const extensionPoint3 = createExtensionPoint<Obj>({ id: 'b3' });
     const extensionPoint4 = createExtensionPoint<Obj>({ id: 'b4' });
     const extensionPoint5 = createExtensionPoint<Obj>({ id: 'b5' });
-    await startTestBackend({
+    const backend = await startTestBackend({
       services: [
         // @ts-expect-error
         [extensionPoint1, { a: 'a' }],
@@ -58,6 +59,7 @@ describe('TestBackend', () => {
       ],
     });
     expect(1).toBe(1);
+    await backend.stop();
   });
 
   it('should start the test backend', async () => {
@@ -87,11 +89,40 @@ describe('TestBackend', () => {
       },
     });
 
-    await startTestBackend({
+    const backend = await startTestBackend({
       services: [sf],
       features: [testModule()],
     });
 
     expect(testFn).toHaveBeenCalledWith('winning');
+    await backend.stop();
+  });
+
+  it('should stop the test backend', async () => {
+    const shutdownSpy = jest.fn();
+
+    const testModule = createBackendModule({
+      moduleId: 'test.module',
+      pluginId: 'test',
+      register(env) {
+        env.registerInit({
+          deps: {
+            lifecycle: lifecycleServiceRef,
+          },
+          async init({ lifecycle }) {
+            lifecycle.addShutdownHook({ fn: shutdownSpy });
+          },
+        });
+      },
+    });
+
+    const backend = await startTestBackend({
+      services: [],
+      features: [testModule()],
+    });
+
+    expect(shutdownSpy).not.toHaveBeenCalled();
+    await backend.stop();
+    expect(shutdownSpy).toHaveBeenCalled();
   });
 });

packages/backend-test-utils/src/next/wiring/TestBackend.ts

@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 
-import { createSpecializedBackend } from '@backstage/backend-app-api';
+import {
+  Backend,
+  createSpecializedBackend,
+  lifecycleFactory,
+  loggerFactory,
+  rootLoggerFactory,
+} from '@backstage/backend-app-api';
 import {
   ServiceFactory,
   ServiceRef,
@@ -47,11 +53,17 @@ export interface TestBackendOptions<
   features?: BackendFeature[];
 }
 
+const defaultServiceFactories = [
+  rootLoggerFactory(),
+  loggerFactory(),
+  lifecycleFactory(),
+];
+
 /** @alpha */
 export async function startTestBackend<
   TServices extends any[],
   TExtensionPoints extends any[],
->(options: TestBackendOptions<TServices, TExtensionPoints>): Promise<void> {
+>(options: TestBackendOptions<TServices, TExtensionPoints>): Promise<Backend> {
   const {
     services = [],
     extensionPoints = [],
@@ -69,17 +81,23 @@ export async function startTestBackend<
           service: ref,
           deps: {},
           factory: async () => async () => impl,
-        });
+        })();
       }
       return createServiceFactory({
         service: ref,
         deps: {},
         factory: async () => impl,
-      });
+      })();
     }
     return serviceDef as ServiceFactory;
   });
 
+  for (const factory of defaultServiceFactories) {
+    if (!factories.some(f => f.service === factory.service)) {
+      factories.push(factory);
+    }
+  }
+
   const backend = createSpecializedBackend({
     ...otherOptions,
     services: factories,
@@ -101,4 +119,6 @@ export async function startTestBackend<
   }
 
   await backend.start();
+
+  return backend;
 }