Small corrections

Author: papafe

src/MongoDB.Driver/Core/Operations/RetryableWriteOperationExecutor.cs

@@ -81,7 +81,7 @@ public static TResult Execute<TResult>(OperationContext operationContext, IRetry
                     //TODO I should throw if backoff exceeeds timeout
                 }
 
-                deprioritizedServers ??= new HashSet<ServerDescription>();
+                deprioritizedServers ??= [];
                 deprioritizedServers.Add(context.LastAcquiredServer);
             }
         }
@@ -143,7 +143,7 @@ public static async Task<TResult> ExecuteAsync<TResult>(OperationContext operati
                     await Task.Delay(backoff, operationContext.CancellationToken).ConfigureAwait(false);
                 }
 
-                deprioritizedServers ??= new HashSet<ServerDescription>();
+                deprioritizedServers ??= [];
                 deprioritizedServers.Add(context.LastAcquiredServer);
             }
         }
@@ -175,7 +175,7 @@ private static bool ShouldRetry(OperationContext operationContext,
             }
 
             var isRetryableWriteException = RetryabilityHelper.IsRetryableWriteException(exception);
-            var isRetryableWrites = AreRetriesAllowed(writeConcern, context, context.ChannelSource.ServerDescription) && isRetryableWriteException;
+            var isRetryableWrites = AreRetriesAllowed(writeConcern, context, context.LastAcquiredServer) && isRetryableWriteException;
 
             var isRetryableReadOrWrite = isRetryableRead || isRetryableWrites;
 

tests/MongoDB.Driver.Tests/Specifications/UnifiedTestSpecRunner.cs

@@ -51,37 +51,27 @@ public UnifiedTestSpecRunner(ITestOutputHelper testOutputHelper)
         [UnifiedTestsTheory("client_side_operations_timeout.tests")]
         public void ClientSideOperationsTimeout(JsonDrivenTestCase testCase)
         {
-            SkipNotSupportedTestCases("dropIndexes");
-            SkipNotSupportedTestCases("findOne");
-            SkipNotSupportedTestCases("listIndexNames");
+            SkipNotSupportedTestCases(testCase, "dropIndexes");
+            SkipNotSupportedTestCases(testCase, "findOne");
+            SkipNotSupportedTestCases(testCase, "listIndexNames");
             // TODO: CSOT: further skipped tests should be unblocked by upcoming fixes
-            SkipNotSupportedTestCases("with only 1 RTT"); // blocked by CSHARP-5627
-            SkipNotSupportedTestCases("createChangeStream"); // TODO: CSOT not implemented yet, CSHARP-3539
-            SkipNotSupportedTestCases("runCommand"); // TODO: CSOT: TimeoutMS is not implemented yet for runCommand
-            SkipNotSupportedTestCases("timeoutMS applies to whole operation, not individual attempts"); // blocked by DRIVERS-3247
-            SkipNotSupportedTestCases("WaitQueueTimeoutError does not clear the pool"); // TODO: CSOT: TimeoutMS is not implemented yet for runCommand
-            SkipNotSupportedTestCases("write concern error MaxTimeMSExpired is transformed"); // TODO: CSOT: investigate error transformation, implementing the requirement might be breaking change
-            SkipNotSupportedTestCases("operation succeeds after one socket timeout - listDatabases on client"); // TODO: listDatabases is not retryable in CSharp Driver, CSHARP-5714
+            SkipNotSupportedTestCases(testCase, "with only 1 RTT"); // blocked by CSHARP-5627
+            SkipNotSupportedTestCases(testCase, "createChangeStream"); // TODO: CSOT not implemented yet, CSHARP-3539
+            SkipNotSupportedTestCases(testCase, "runCommand"); // TODO: CSOT: TimeoutMS is not implemented yet for runCommand
+            SkipNotSupportedTestCases(testCase, "timeoutMS applies to whole operation, not individual attempts"); // blocked by DRIVERS-3247
+            SkipNotSupportedTestCases(testCase, "WaitQueueTimeoutError does not clear the pool"); // TODO: CSOT: TimeoutMS is not implemented yet for runCommand
+            SkipNotSupportedTestCases(testCase, "write concern error MaxTimeMSExpired is transformed"); // TODO: CSOT: investigate error transformation, implementing the requirement might be breaking change
+            SkipNotSupportedTestCases(testCase, "operation succeeds after one socket timeout - listDatabases on client"); // TODO: listDatabases is not retryable in CSharp Driver, CSHARP-5714
 
             Run(testCase);
-
-            void SkipNotSupportedTestCases(string operationName)
-            {
-                if (testCase.Name.Contains(operationName))
-                {
-                    throw new SkipException($"Test skipped because {operationName} is not supported.");
-                }
-            }
         }
 
         [UnifiedTestsTheory("client_backpressure.tests")]
         public void ClientBackpressure(JsonDrivenTestCase testCase)
         {
-            //TODO Do we want to do something about these operations?
-            if (testCase.Name.Contains("findOne ") || testCase.Name.Contains("dropIndexes ") || testCase.Name.Contains("listIndexNames "))
-            {
-                throw new SkipException($"Test skipped because operation is not supported.");
-            }
+            SkipNotSupportedTestCases(testCase, "dropIndexes");
+            SkipNotSupportedTestCases(testCase, "findOne");
+            SkipNotSupportedTestCases(testCase, "listIndexNames");
 
             Run(testCase);
         }
@@ -268,6 +258,14 @@ private void Run(JsonDrivenTestCase testCase, Predicate<LogEntry> loggingFilter
         private static void RequireKmsMock() =>
             RequireEnvironment.Check().EnvironmentVariable("KMS_MOCK_SERVERS_ENABLED");
 
+        private static void SkipNotSupportedTestCases(JsonDrivenTestCase testCase, string operationName)
+        {
+            if (testCase.Name.Contains(operationName))
+            {
+                throw new SkipException($"Test skipped because {operationName} is not supported.");
+            }
+        }
+
         // used by SkippedTestsProvider property in UnifiedTests attribute.
         private static readonly HashSet<string> __ignoredTests = new(
         [