test: skip correctly

Author: durran

test/integration/transactions-convenient-api/transactions-convenient-api.spec.test.ts

@@ -10,19 +10,25 @@ const SKIPPED_TESTS = [
 ];
 
 describe('Transactions Convenient API Spec Unified Tests', function () {
-  this.beforeEach(function () {
+  beforeEach(function () {
     if (this.configuration.topologyType === 'LoadBalanced') {
       if (this.currentTest) {
         this.currentTest.skipReason =
           'TODO(NODE-5931) - Fix socket leaks in load balancer transaction tests.';
       }
+      this.skip();
+    }
+    if (this.configuration.topologyType === 'Sharded' && process.env.MONGODB_VERSION === 'latest') {
+      if (this.currentTest) {
+        this.currentTest.skipReason = 'TODO(DRIVERS-2816) - Fix migration conflict errors';
+      }
+      this.skip();
     }
-    this.skip();
   });
 
   runUnifiedSuite(loadSpecTests(path.join('transactions-convenient-api', 'unified')), test => {
     return SKIPPED_TESTS.includes(test.description)
-      ? 'TODO(NODE-): Skipping failing transaction tests'
+      ? 'TODO(DRIVERS-5855): Skipping failing transaction tests'
       : false;
   });
 });

test/tools/unified-spec-runner/entities.ts

@@ -543,8 +543,6 @@ export class EntitiesMap<E = Entity> extends Map<string, E> {
     trace('endSessions');
     for (const [, session] of this.mapOf('session')) {
       await session.endSession({ force: true });
-      // In case the endSession logic didn't unpin the server.
-      // session.unpin({ force: true });
     }
 
     trace('closeClient');