remove skips

Author: aditi-khare-mongoDB

src/error.ts

@@ -1240,10 +1240,8 @@ export function needsRetryableWriteLabel(
     }
   }
 
-  if (error instanceof MongoWriteConcernError) {
-    return isSharded && maxWireVersion < 9
-      ? false
-      : RETRYABLE_WRITE_ERROR_CODES.has(error.result?.code ?? error.code ?? 0);
+  if (error instanceof MongoWriteConcernError && !isSharded && maxWireVersion >= 9) {
+    return RETRYABLE_WRITE_ERROR_CODES.has(error.result?.code ?? error.code ?? 0);
   }
 
   if (error instanceof MongoError && typeof error.code === 'number') {

test/integration/retryable-writes/retryable_writes.spec.test.ts

@@ -1,6 +1,5 @@
 import { expect } from 'chai';
 import * as path from 'path';
-import { lt } from 'semver';
 
 import type { Collection, Db, MongoClient } from '../../mongodb';
 import { loadSpecTests } from '../../spec';
@@ -20,26 +19,8 @@ describe('Legacy Retryable Writes Specs', function () {
 
   const retryableWrites = loadSpecTests('retryable-writes', 'legacy');
 
-  const LEGACY_SKIP_TESTS_4_4_SHARDED = [
-    'BulkWrite succeeds after WriteConcernError ShutdownInProgress',
-    'DeleteOne succeeds after WriteConcernError ShutdownInProgress',
-    'FindOneAndDelete succeeds after WriteConcernError ShutdownInProgress',
-    'FindOneAndReplace succeeds after WriteConcernError ShutdownInProgress',
-    'FindOneAndUpdate succeeds after WriteConcernError ShutdownInProgress',
-    'InsertMany succeeds after WriteConcernError ShutdownInProgress',
-    'InsertOne succeeds after WriteConcernError InterruptedAtShutdown',
-    'InsertOne succeeds after WriteConcernError InterruptedDueToReplStateChange',
-    'InsertOne succeeds after WriteConcernError PrimarySteppedDown',
-    'InsertOne succeeds after WriteConcernError ShutdownInProgress',
-    'InsertOne fails after multiple retryable writeConcernErrors',
-    'ReplaceOne succeeds after WriteConcernError ShutdownInProgress',
-    'UpdateOne succeeds after WriteConcernError ShutdownInProgress'
-  ];
-
   for (const suite of retryableWrites) {
     describe(suite.name, function () {
-      let isShardedAndBefore4_4 = false;
-
       beforeEach(async function () {
         let utilClient: MongoClient;
         if (this.configuration.isLoadBalanced) {
@@ -57,9 +38,6 @@ describe('Legacy Retryable Writes Specs', function () {
           !allRequirements.length ||
           (await isAnyRequirementSatisfied(this.currentTest.ctx, allRequirements, utilClient));
 
-        isShardedAndBefore4_4 =
-          this.configuration.topologyType === 'Sharded' && lt(this.configuration.version, '4.4.0');
-
         await utilClient.close();
 
         if (!someRequirementMet) this.skip();
@@ -86,16 +64,14 @@ describe('Legacy Retryable Writes Specs', function () {
         ctx = {}; // reset context
       });
       for (const spec of suite.tests) {
-        if (!LEGACY_SKIP_TESTS_4_4_SHARDED.includes(spec.description) && !isShardedAndBefore4_4) {
-          // Step 2: Run the test
-          const mochaTest = it(spec.description, async () => await executeScenarioTest(spec, ctx));
-
-          // A pattern we don't need to repeat for unified tests
-          // In order to give the beforeEach hook access to the
-          // spec test so it can be responsible for skipping it
-          // and executeScenarioSetup
-          mochaTest.spec = spec;
-        }
+        // Step 2: Run the test
+        const mochaTest = it(spec.description, async () => await executeScenarioTest(spec, ctx));
+
+        // A pattern we don't need to repeat for unified tests
+        // In order to give the beforeEach hook access to the
+        // spec test so it can be responsible for skipping it
+        // and executeScenarioSetup
+        mochaTest.spec = spec;
       }
     });
   }