From 47ad5424b528692a94340d8f7f55add42a810596 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 20 Feb 2024 13:45:33 +0100 Subject: [PATCH] test(NODE-5807): sync cmap format spec tests --- ...ection_monitoring_and_pooling.spec.test.ts | 3 +- .../pool-clear-interrupt-immediately.json | 77 ------------------- .../pool-clear-interrupt-immediately.yml | 46 ----------- 3 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 test/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupt-immediately.json delete mode 100644 test/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupt-immediately.yml diff --git a/test/integration/connection-monitoring-and-pooling/connection_monitoring_and_pooling.spec.test.ts b/test/integration/connection-monitoring-and-pooling/connection_monitoring_and_pooling.spec.test.ts index 722ebe56611..d869d05746c 100644 --- a/test/integration/connection-monitoring-and-pooling/connection_monitoring_and_pooling.spec.test.ts +++ b/test/integration/connection-monitoring-and-pooling/connection_monitoring_and_pooling.spec.test.ts @@ -17,8 +17,7 @@ const LB_SKIP_TESTS: SkipDescription[] = [ 'clearing a paused pool emits no events', 'after clear, cannot check out connections until pool ready', 'readying a ready pool emits no events', - 'error during minPoolSize population clears pool', - 'Connections MUST be interrupted as soon as possible (interruptInUseConnections=true)' + 'error during minPoolSize population clears pool' ].map(description => ({ description, skipIfCondition: 'loadBalanced', diff --git a/test/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupt-immediately.json b/test/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupt-immediately.json deleted file mode 100644 index 54e2566ede8..00000000000 --- a/test/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupt-immediately.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "version": 1, - "style": "unit", - "description": "Connections MUST be interrupted as soon as possible (interruptInUseConnections=true)", - "poolOptions": { - "backgroundThreadIntervalMS": 10000 - }, - "operations": [ - { - "name": "ready" - }, - { - "name": "checkOut" - }, - { - "name": "checkOut", - "label": "conn" - }, - { - "name": "clear", - "interruptInUseConnections": true - }, - { - "name": "waitForEvent", - "event": "ConnectionPoolCleared", - "count": 1, - "timeout": 1000 - }, - { - "name": "waitForEvent", - "event": "ConnectionClosed", - "count": 2, - "timeout": 1000 - }, - { - "name": "close" - } - ], - "events": [ - { - "type": "ConnectionCheckedOut", - "connectionId": 1, - "address": 42 - }, - { - "type": "ConnectionCheckedOut", - "connectionId": 2, - "address": 42 - }, - { - "type": "ConnectionPoolCleared", - "interruptInUseConnections": true - }, - { - "type": "ConnectionClosed", - "reason": "stale", - "address": 42 - }, - { - "type": "ConnectionClosed", - "reason": "stale", - "address": 42 - }, - { - "type": "ConnectionPoolClosed", - "address": 42 - } - ], - "ignore": [ - "ConnectionCreated", - "ConnectionPoolReady", - "ConnectionReady", - "ConnectionCheckOutStarted", - "ConnectionPoolCreated", - "ConnectionCheckedIn" - ] -} diff --git a/test/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupt-immediately.yml b/test/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupt-immediately.yml deleted file mode 100644 index 67d9739aa9b..00000000000 --- a/test/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupt-immediately.yml +++ /dev/null @@ -1,46 +0,0 @@ -version: 1 -style: unit -description: Connections MUST be interrupted as soon as possible (interruptInUseConnections=true) -poolOptions: - # ensure it's not involved by default - backgroundThreadIntervalMS: 10000 -operations: - - name: ready - - name: checkOut - - name: checkOut - label: conn - - name: clear - interruptInUseConnections: true - - name: waitForEvent - event: ConnectionPoolCleared - count: 1 - timeout: 1000 - - name: waitForEvent - event: ConnectionClosed - count: 2 - timeout: 1000 - - name: close -events: - - type: ConnectionCheckedOut - connectionId: 1 - address: 42 - - type: ConnectionCheckedOut - connectionId: 2 - address: 42 - - type: ConnectionPoolCleared - interruptInUseConnections: true - - type: ConnectionClosed - reason: stale - address: 42 - - type: ConnectionClosed - reason: stale - address: 42 - - type: ConnectionPoolClosed - address: 42 -ignore: - - ConnectionCreated - - ConnectionPoolReady - - ConnectionReady - - ConnectionCheckOutStarted - - ConnectionPoolCreated - - ConnectionCheckedIn