unskip tests and update cmap runner to use interruptInUseConnections

Author: baileympearson

test/integration/connection-monitoring-and-pooling/connection_monitoring_and_pooling.spec.test.ts

@@ -19,16 +19,6 @@ const LB_SKIP_TESTS: SkipDescription[] = [
   skipReason: 'cannot run against a load balanced environment'
 }));
 
-const INTERRUPT_IN_USE_CONNECTIONS_TESTS: SkipDescription[] = [
-  'Connections MUST be interrupted as soon as possible (interruptInUseConnections=true)',
-  'Pool clear SHOULD schedule the next background thread run immediately (interruptInUseConnections: false)',
-  'clear with interruptInUseConnections = true closes pending connections'
-].map(description => ({
-  description,
-  skipIfCondition: 'always',
-  skipReason: 'TODO(NODE-4691): cancel inflight operations when heartbeat fails'
-}));
-
 describe('Connection Monitoring and Pooling Spec Tests (Integration)', function () {
   const tests: CmapTest[] = loadSpecTests('connection-monitoring-and-pooling');
 
@@ -40,6 +30,6 @@ describe('Connection Monitoring and Pooling Spec Tests (Integration)', function
         skipReason:
           'not applicable: waitQueueTimeoutMS limits connection establishment time in our driver'
       }
-    ]).concat(INTERRUPT_IN_USE_CONNECTIONS_TESTS)
+    ])
   });
 });

test/integration/server-discovery-and-monitoring/server_discovery_and_monitoring.spec.test.ts

@@ -4,16 +4,5 @@ import { loadSpecTests } from '../../spec';
 import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner';
 
 describe('SDAM Unified Tests', function () {
-  const sdamPoolClearedTests = [
-    'Connection pool clear uses interruptInUseConnections=true after monitor timeout',
-    'Error returned from connection pool clear with interruptInUseConnections=true is retryable',
-    'Error returned from connection pool clear with interruptInUseConnections=true is retryable for write'
-  ];
-  runUnifiedSuite(
-    loadSpecTests(path.join('server-discovery-and-monitoring', 'unified')),
-    ({ description }) =>
-      sdamPoolClearedTests.includes(description)
-        ? 'TODO(NODE-4691): interrupt in-use operations on heartbeat failure'
-        : false
-  );
+  runUnifiedSuite(loadSpecTests(path.join('server-discovery-and-monitoring', 'unified')));
 });

test/tools/cmap_spec_runner.ts

@@ -197,10 +197,8 @@ const getTestOpDefinitions = (threadContext: ThreadContext) => ({
 
     return threadContext.pool.checkIn(connection);
   },
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   clear: function (interruptInUseConnections: boolean) {
-    // TODO(NODE-4619): pass interruptInUseConnections into clear pool method
-    return threadContext.pool.clear();
+    return threadContext.pool.clear({ interruptInUseConnections });
   },
   close: async function () {
     return await promisify(ConnectionPool.prototype.close).call(threadContext.pool);