Merge branch '5.x' into NODE-5967/5.x-container-and-kubernetes-awareness

Author: nbbeeken

test/integration/transactions/transactions.spec.test.js

@@ -78,11 +78,25 @@ class TransactionsRunnerContext extends TestRunnerContext {
   }
 }
 
+const UNIFIED_SKIP_TESTS = [
+  'unpin after TransientTransactionError error on commit',
+  'unpin on successful abort',
+  'unpin after non-transient error on abort',
+  'unpin after TransientTransactionError error on abort',
+  'unpin when a new transaction is started',
+  'unpin when a non-transaction write operation uses a session',
+  'unpin when a non-transaction read operation uses a session'
+];
+
 describe('Transactions Spec Unified Tests', function () {
-  runUnifiedSuite(loadSpecTests(path.join('transactions', 'unified')));
+  runUnifiedSuite(loadSpecTests(path.join('transactions', 'unified')), test =>
+    UNIFIED_SKIP_TESTS.includes(test.description)
+      ? 'TODO(NODE-5855): Unskip Transactions Spec Unified Tests mongos-unpin.unpin'
+      : false
+  );
 });
 
-const SKIP_TESTS = [
+const LEGACY_SKIP_TESTS = [
   // TODO(NODE-3943): Investigate these commit test failures
   // OLD COMMENT: commitTransaction retry seems to be swallowed by mongos in these two cases
   'commitTransaction retry fails on new mongos',
@@ -97,7 +111,7 @@ describe('Transactions Spec Legacy Tests', function () {
   const testContext = new TransactionsRunnerContext();
   if (process.env.SERVERLESS) {
     // TODO(NODE-3550): these tests should pass on serverless but currently fail
-    SKIP_TESTS.push(
+    LEGACY_SKIP_TESTS.push(
       'abortTransaction only performs a single retry',
       'abortTransaction does not retry after Interrupted',
       'abortTransaction does not retry after WriteConcernError Interrupted',
@@ -114,7 +128,7 @@ describe('Transactions Spec Legacy Tests', function () {
   });
 
   function testFilter(spec) {
-    return SKIP_TESTS.indexOf(spec.description) === -1;
+    return LEGACY_SKIP_TESTS.indexOf(spec.description) === -1;
   }
 
   generateTopologyTests(testSuites, testContext, testFilter);