✅ (dmk) [NO-ISSUE]: Fix open handles in dmk tests (#497)

LedgerHQ · Nov 14, 2024 · bbff1e6 · bbff1e6
2 parents df2b2f1 + bed562b
commit bbff1e6
Show file tree

Hide file tree

Showing 12 changed files with 283 additions and 203 deletions.
diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "rimraf": "^6.0.1",
     "ts-jest": "^29.2.5",
     "tsc-alias": "^1.8.10",
-    "turbo": "^2.2.1",
+    "turbo": "^2.2.3",
     "typescript": "^5.6.3",
     "zx": "^8.1.9"
   },

diff --git a/packages/device-management-kit/src/api/command/use-case/SendCommandUseCase.test.ts b/packages/device-management-kit/src/api/command/use-case/SendCommandUseCase.test.ts
@@ -59,6 +59,8 @@ describe("SendCommandUseCase", () => {
       command,
     });
 
+    deviceSession.close();
+
     expect(response).toStrictEqual({
       status: CommandResultStatus.Success,
       data: undefined,

diff --git a/...ges/device-management-kit/src/api/logger-subscriber/service/WebLogsExporterLogger.test.ts b/...ges/device-management-kit/src/api/logger-subscriber/service/WebLogsExporterLogger.test.ts
@@ -42,6 +42,7 @@ describe("getJSONStringifyReplacer", () => {
     const expected = `{"id":"mockedSessionId","connectedDevice":{"deviceModel":${JSON.stringify(
       stubDeviceModel,
     )},"type":"USB","id":"mockedDeviceId"}}`;
+    value.close();
     expect(result).toEqual(expected);
   });
 

diff --git a/...ce-management-kit/src/internal/device-session/service/DefaultDeviceSessionService.test.ts b/...ce-management-kit/src/internal/device-session/service/DefaultDeviceSessionService.test.ts
@@ -40,52 +40,61 @@ describe("DefaultDeviceSessionService", () => {
 
   it("should have an empty sessions list", () => {
     expect(sessionService.getDeviceSessions()).toEqual([]);
+    deviceSession.close();
   });
 
   it("should add a deviceSession", () => {
     sessionService.addDeviceSession(deviceSession);
+    deviceSession.close();
     expect(sessionService.getDeviceSessions()).toEqual([deviceSession]);
   });
 
   it("should not add a deviceSession if it already exists", () => {
     sessionService.addDeviceSession(deviceSession);
     sessionService.addDeviceSession(deviceSession);
+    deviceSession.close();
     expect(sessionService.getDeviceSessions()).toEqual([deviceSession]);
   });
 
   it("should remove a deviceSession", () => {
     sessionService.addDeviceSession(deviceSession);
+    deviceSession.close();
     sessionService.removeDeviceSession(deviceSession.id);
     expect(sessionService.getDeviceSessions()).toEqual([]);
   });
 
   it("should not remove a deviceSession if it does not exist", () => {
+    deviceSession.close();
     sessionService.removeDeviceSession(deviceSession.id);
     expect(sessionService.getDeviceSessions()).toEqual([]);
   });
 
   it("should get a deviceSession", () => {
     sessionService.addDeviceSession(deviceSession);
+    deviceSession.close();
     expect(sessionService.getDeviceSessionById(deviceSession.id)).toEqual(
       Either.of(deviceSession),
     );
   });
 
   it("should not get a deviceSession if it does not exist", () => {
+    deviceSession.close();
     expect(sessionService.getDeviceSessionById(deviceSession.id)).toEqual(
       Left(new DeviceSessionNotFound()),
     );
   });
 
   it("should get all sessions", () => {
     sessionService.addDeviceSession(deviceSession);
+    deviceSession.close();
     expect(sessionService.getDeviceSessions()).toEqual([deviceSession]);
   });
 
   it("should retrieve sessionObs", () => {
     expect(sessionService.sessionsObs).toBeInstanceOf(
       Observable<DeviceSession>,
     );
+    deviceSession.close();
   });
 
   it("should emit new session", (done) => {
@@ -97,6 +106,7 @@ describe("DefaultDeviceSessionService", () => {
       },
     });
     sessionService.addDeviceSession(deviceSession);
+    deviceSession.close();
   });
 
   it("should emit previous added session", () => {
@@ -114,6 +124,8 @@ describe("DefaultDeviceSessionService", () => {
         emittedSessions.push(emittedDeviceSession);
       },
     });
+    deviceSession.close();
+    lastDeviceSession.close();
     expect(emittedSessions).toEqual([deviceSession, lastDeviceSession]);
     subscription.unsubscribe();
   });

diff --git a/...-management-kit/src/internal/device-session/use-case/GetDeviceSessionStateUseCase.test.ts b/...-management-kit/src/internal/device-session/use-case/GetDeviceSessionStateUseCase.test.ts
@@ -51,6 +51,8 @@ describe("GetDeviceSessionStateUseCase", () => {
       sessionId: fakeSessionId,
     });
 
+    deviceSession.close();
+
     // then
     expect(response).toStrictEqual(deviceSession.state);
   });

diff --git a/...s/device-management-kit/src/internal/discovery/use-case/GetConnectedDeviceUseCase.test.ts b/...s/device-management-kit/src/internal/discovery/use-case/GetConnectedDeviceUseCase.test.ts
@@ -49,6 +49,8 @@ describe("GetConnectedDevice", () => {
       sessionId: fakeSessionId,
     });
 
+    deviceSession.close();
+
     // then
     expect(response).toBeInstanceOf(ConnectedDevice);
   });
@@ -68,6 +70,8 @@ describe("GetConnectedDevice", () => {
       sessionId: fakeSessionId,
     });
 
+    deviceSession.close();
+
     // then
     expect(response).toStrictEqual(
       new ConnectedDevice({

diff --git a/...device-management-kit/src/internal/discovery/use-case/ListConnectedDevicesUseCase.test.ts b/...device-management-kit/src/internal/discovery/use-case/ListConnectedDevicesUseCase.test.ts
@@ -51,6 +51,9 @@ describe("ListDeviceSessionsUseCase", () => {
     // when
     const response = useCase.execute();
 
+    deviceSession1.close();
+    deviceSession2.close();
+
     // then
     expect(response).toStrictEqual([
       new ConnectedDevice({

diff --git a/...ice-management-kit/src/internal/discovery/use-case/ListenToConnectedDeviceUseCase.test.ts b/...ice-management-kit/src/internal/discovery/use-case/ListenToConnectedDeviceUseCase.test.ts
@@ -58,11 +58,16 @@ describe("ListenToConnectedDevice", () => {
             sessionId: fakeSessionId,
           }),
         );
-        subscription.unsubscribe();
-        done();
+        terminate();
       },
     });
 
+    function terminate() {
+      subscription.unsubscribe();
+      deviceSession.close();
+      done();
+    }
+
     // when
     sessionService.addDeviceSession(deviceSession);
   });

diff --git a/packages/device-management-kit/src/internal/send/use-case/SendApduUseCase.test.ts b/packages/device-management-kit/src/internal/send/use-case/SendApduUseCase.test.ts
@@ -51,6 +51,7 @@ describe("SendApduUseCase", () => {
       apdu: new Uint8Array([0x00, 0x01, 0x02, 0x03]),
     });
 
+    deviceSession.close();
     // then
     expect(deviceSession.connectedDevice.sendApdu).toHaveBeenCalledTimes(1);
     expect(response).toBeDefined();
@@ -91,6 +92,8 @@ describe("SendApduUseCase", () => {
       apdu: new Uint8Array([0x00, 0x01, 0x02, 0x03]),
     });
 
+    deviceSession.close();
+
     // then
     await expect(response).rejects.toBeInstanceOf(ReceiverApduError);
   });

diff --git a/packages/device-management-kit/src/internal/transport/model/InternalConnectedDevice.test.ts b/packages/device-management-kit/src/internal/transport/model/InternalConnectedDevice.test.ts
@@ -1,3 +1,5 @@
+import { Right } from "purify-ts";
+
 import { defaultApduResponseStubBuilder } from "@api/device-session/ApduResponse.stub";
 import { deviceModelStubBuilder } from "@internal/device-model/model/DeviceModel.stub";
 import { InternalConnectedDevice } from "@internal/transport/model/InternalConnectedDevice";
@@ -30,8 +32,8 @@ describe("InternalConnectedDevice", () => {
   });
 
   it("should return the correct send apdu response", () => {
-    expect(connectedDevice.sendApdu(new Uint8Array())).toMatchObject(
-      Promise.resolve(defaultApduResponseStubBuilder()),
+    expect(connectedDevice.sendApdu(new Uint8Array())).resolves.toMatchObject(
+      Right(defaultApduResponseStubBuilder()),
     );
   });
 });