rolling back some changes made for test fixing to go with another strategy.

Author: craiggwilson

src/MongoDB.Driver.Core.TestHelpers/CoreTestConfiguration.cs

@@ -116,13 +116,16 @@ public static ClusterBuilder ConfigureCluster(ClusterBuilder builder)
                 }
             }
 
+            return ConfigureLogging(builder);
+        }
+
+        public static ClusterBuilder ConfigureLogging(ClusterBuilder builder)
+        {
             var traceSource = new TraceSource("mongodb-tests", SourceLevels.Information);
             traceSource.Listeners.Clear(); // remove the default listener
             var listener = new ConsoleTraceListener();
             traceSource.Listeners.Add(listener);
-            builder = builder.TraceWith(traceSource);
-
-            return builder;
+            return builder.TraceWith(traceSource);
         }
 
         public static ICluster CreateCluster()

src/MongoDB.Driver.TestHelpers/DriverTestConfiguration.cs

@@ -34,7 +34,18 @@ public static class DriverTestConfiguration
         // static constructor
         static DriverTestConfiguration()
         {
-            __client = new Lazy<MongoClient>(() => new MongoClient(CoreTestConfiguration.Cluster), true);
+            var connectionString = CoreTestConfiguration.ConnectionString.ToString();
+            var clientSettings = MongoClientSettings.FromUrl(new MongoUrl(connectionString));
+
+            var serverSelectionTimeoutString = Environment.GetEnvironmentVariable("MONGO_SERVER_SELECTION_TIMEOUT_MS");
+            if (serverSelectionTimeoutString == null)
+            {
+                serverSelectionTimeoutString = "30000";
+            }
+            clientSettings.ServerSelectionTimeout = TimeSpan.FromMilliseconds(int.Parse(serverSelectionTimeoutString));
+            clientSettings.ClusterConfigurator = cb => CoreTestConfiguration.ConfigureLogging(cb);
+
+            __client = new Lazy<MongoClient>(() => new MongoClient(clientSettings), true);
             __databaseNamespace = CoreTestConfiguration.DatabaseNamespace;
             __collectionNamespace = new CollectionNamespace(__databaseNamespace, "testcollection");
         }

src/MongoDB.Driver/MongoClient.cs

@@ -71,13 +71,6 @@ public MongoClient(string connectionString)
         {
         }
 
-        internal MongoClient(ICluster cluster)
-        {
-            _settings = new MongoClientSettings();
-            _cluster = Ensure.IsNotNull(cluster, "cluster");
-            _operationExecutor = new OperationExecutor();
-        }
-
         internal MongoClient(IOperationExecutor operationExecutor)
             : this()
         {