From b4b423bab4e22577c3fb74c00894dfacbef4e698 Mon Sep 17 00:00:00 2001 From: ATX Bot Date: Mon, 8 Jun 2026 15:32:18 +0200 Subject: [PATCH] Fix merge conflict marker in state_machine_manager_coverage.spec.ts. All 158 cwmp tests pass. Build status: Success --- .../unit/services/cwmp/state_machine_manager_coverage.spec.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts b/tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts index 0ee30e3..f2467fb 100644 --- a/tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts +++ b/tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts @@ -90,11 +90,7 @@ describe('StateMachineManager — coverage', () => { // Second: BOOT event arrives on same session (same TCP connection, new Inform) const machine2 = await manager.startStateMachine(device, 'sess-5', { events: ['1 BOOT'] }) // Should have preempted to MainStateMachine (same machine instance, new state machine inside) -<<<<<<< Updated upstream - // Since gpnStatus=unsupported, the machine starts in critical-reads (or idle if GPV skipped) -======= // Since gpnStatus=unsupported, it starts and goes directly to critical-reads ->>>>>>> Stashed changes const stateName = machine2.stateMachine.getCurrentStateName() expect(stateName === 'idle' || stateName === 'critical-reads').toBe(true) })