chore: fix sisyfos unit tests reliability

Author: nytamin

packages/timeline-state-resolver/src/__tests__/lib.ts

@@ -86,11 +86,9 @@ declare global {
 		}
 	}
 }
-/** setTimeout (not affected by jest.fakeTimers) */
-const setTimeoutOrg = setTimeout
 /** Sleep for a  */
 export async function waitTime(ms: number): Promise<void> {
-	return new Promise((resolve) => setTimeoutOrg(resolve, ms))
+	return new Promise((resolve) => jest.requireActual('timers').setTimeout(resolve, ms))
 }
 
 /** The current time, not affected by jest.fakeTimers */

packages/timeline-state-resolver/src/__tests__/mockTime.ts

@@ -1,3 +1,5 @@
+import { waitTime } from './lib'
+
 export class MockTime {
 	private _now = 10000
 	private _hasBeeninit = false
@@ -53,6 +55,8 @@ export class MockTime {
 			jest.advanceTimersByTime(advanceChunk)
 		}
 		await this.tick()
+
+		await waitTime(1) // Do an extra setTimeout here, so that any waiting timers are executed
 	}
 	advanceTimeToTicks = async (time: number) => {
 		const advance = time - this._now

packages/timeline-state-resolver/src/integrations/sisyfos/__tests__/sisyfos.spec.ts

@@ -262,6 +262,7 @@ describe('Sisyfos', () => {
 			channel: 0,
 			value: false,
 		})
+		await myConductor.destroy()
 	})
 	test('Sisyfos: set ch1: pgm & ch2: lookahead and then ch1: vo, ch2: pgm', async () => {
 		const commandReceiver0: any = jest.fn(async () => {
@@ -489,6 +490,7 @@ describe('Sisyfos', () => {
 			channel: 0,
 			value: false,
 		})
+		await myConductor.destroy()
 	})
 
 	test('Sisyfos: set lookahead and take to pgm, with lookahead still on', async () => {
@@ -633,6 +635,7 @@ describe('Sisyfos', () => {
 			channel: 1,
 			values: [0],
 		})
+		await myConductor.destroy()
 	})
 
 	test('Sisyfos: using CHANNELS', async () => {
@@ -853,6 +856,8 @@ describe('Sisyfos', () => {
 		})
 
 		commandReceiver0.mockClear()
+
+		await myConductor.destroy()
 	})
 
 	test('Sisyfos: using global triggerValue', async () => {
@@ -1061,6 +1066,8 @@ describe('Sisyfos', () => {
 		})
 
 		commandReceiver0.mockClear()
+
+		await myConductor.destroy()
 	})
 
 	test('Sisyfos: using per-channel triggerValue - initially defined', async () => {
@@ -1213,6 +1220,8 @@ describe('Sisyfos', () => {
 		})
 
 		commandReceiver0.mockClear()
+
+		await myConductor.destroy()
 	})
 
 	test('Sisyfos: using per-channel triggerValue - initially undefined', async () => {
@@ -1351,6 +1360,8 @@ describe('Sisyfos', () => {
 		expect(commandReceiver0.mock.calls.length).toEqual(0)
 
 		commandReceiver0.mockClear()
+
+		await myConductor.destroy()
 	})
 
 	test('Connection status', async () => {
@@ -1417,6 +1428,7 @@ describe('Sisyfos', () => {
 
 		expect(await device.connected).toEqual(true)
 		expect(onConnectionChanged.mock.calls.length).toBeGreaterThanOrEqual(1)
+		await myConductor.destroy()
 	})
 
 	describe('convertTimelineStateToDeviceState', () => {