Skip to content

Commit 3644271

Browse files
CSHARP-2629: Remove workaround.
1 parent fc8f926 commit 3644271

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

tests/MongoDB.Driver.TestHelpers/DriverTestConfiguration.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
using System;
1717
using System.Collections.Generic;
1818
using System.Linq;
19-
using System.Net;
20-
using System.Net.Sockets;
21-
using MongoDB.Bson;
2219
using MongoDB.Driver.Core;
20+
using MongoDB.Driver.Core.Clusters;
2321
using MongoDB.Driver.Core.Configuration;
2422
using MongoDB.Driver.TestHelpers;
2523

@@ -113,9 +111,15 @@ public static DisposableMongoClient CreateDisposableClient(Action<ClusterBuilder
113111
}
114112

115113
public static DisposableMongoClient CreateDisposableClient(
116-
Action<MongoClientSettings> clientSettingsConfigurator,
114+
Action<MongoClientSettings> clientSettingsConfigurator,
117115
bool useMultipleShardRouters = false)
118116
{
117+
if (CoreTestConfiguration.Cluster.Description.Type != ClusterType.Sharded)
118+
{
119+
// This option has no effect for non-sharded topologies.
120+
useMultipleShardRouters = false;
121+
}
122+
119123
var connectionString = useMultipleShardRouters
120124
? CoreTestConfiguration.ConnectionStringWithMultipleShardRouters.ToString()
121125
: CoreTestConfiguration.ConnectionString.ToString();

tests/MongoDB.Driver.Tests/Specifications/Runner/MongoClientJsonDrivenTestRunnerBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ protected FailPoint ConfigureFailPoint(BsonDocument test)
337337
protected DisposableMongoClient CreateDisposableClient(BsonDocument test, EventCapturer eventCapturer)
338338
{
339339
var useMultipleShardRouters = test.GetValue("useMultipleMongoses", false).AsBoolean;
340-
useMultipleShardRouters = false; // TODO: remove this line once SERVER-41532 is fixed
341340

342341
return DriverTestConfiguration.CreateDisposableClient(
343342
settings =>

0 commit comments

Comments
 (0)