Fixed some more problems when running unit tests against replica sets.

Author: rstam

MongoDB.Driver/Communication/Proxies/DiscoveringMongoServerProxy.cs

@@ -96,6 +96,23 @@ public ReadOnlyCollection<MongoServerInstance> Instances
             }
         }
 
+        /// <summary>
+        /// Gets the name of the replica set (null if not connected to a replica set).
+        /// </summary>
+        public string ReplicaSetName
+        {
+            get
+            {
+                var replicaSetProxy = _serverProxy as ReplicaSetMongoServerProxy;
+                if (replicaSetProxy != null)
+                {
+                    return replicaSetProxy.ReplicaSetName;
+                }
+
+                return null;
+            }
+        }
+
         /// <summary>
         /// Gets the state.
         /// </summary>

MongoDB.Driver/MongoCollection.cs

@@ -1780,7 +1780,7 @@ private TCommandResult RunCommandAs<TCommandResult>(
                 resultSerializationOptions,
                 resultSerializer);
 
-            var connection = _server.AcquireConnection(ReadPreference.Primary);
+            var connection = _server.AcquireConnection(readPreference);
             try
             {
                 return commandOperation.Execute(connection);

MongoDB.Driver/MongoServer.cs

@@ -295,10 +295,16 @@ public virtual string ReplicaSetName
         {
             get 
             {
-                var instanceManager = _serverProxy as ReplicaSetMongoServerProxy;
-                if (instanceManager != null)
+                var replicaSetProxy = _serverProxy as ReplicaSetMongoServerProxy;
+                if (replicaSetProxy != null)
                 {
-                    return instanceManager.ReplicaSetName;
+                    return replicaSetProxy.ReplicaSetName;
+                }
+
+                var discoveringProxy = _serverProxy as DiscoveringMongoServerProxy;
+                if (discoveringProxy != null)
+                {
+                    return discoveringProxy.ReplicaSetName;
                 }
 
                 return null;

MongoDB.DriverUnitTests/Jira/CSharp269Tests.cs

@@ -18,7 +18,9 @@
 using System.Text;
 using System.Threading;
 using MongoDB.Driver;
+using MongoDB.Driver.GridFS;
 using NUnit.Framework;
+using MongoDB.Driver.Builders;
 
 namespace MongoDB.DriverUnitTests.Jira.CSharp269
 {
@@ -43,19 +45,21 @@ public void TestFixtureSetup()
         [Test]
         public void TestUploadAndDownload()
         {
+            MongoGridFSFileInfo uploadedFileInfo;
+
             var text = "HelloWorld";
             var bytes = Encoding.UTF8.GetBytes(text);
             using (var stream = new MemoryStream(bytes))
             {
-                _database.GridFS.Upload(stream, "HelloWorld.txt");
+                uploadedFileInfo = _database.GridFS.Upload(stream, "HelloWorld.txt");
             }
 
             // use RequestStart so that if we are running this test against a replica set we will bind to a specific secondary
             using (_server.RequestStart(_database, ReadPreference.SecondaryPreferred))
             {
                 // wait for the GridFS file to be replicated before trying to Download it
                 var timeoutAt = DateTime.UtcNow.AddSeconds(30);
-                while (!_database.GridFS.Exists("HelloWorld.txt"))
+                while (!_database.GridFS.Exists(Query.EQ("_id", uploadedFileInfo.Id)))
                 {
                     if (DateTime.UtcNow >= timeoutAt)
                     {

MongoDB.DriverUnitTests/MongoServerTests.cs

@@ -218,7 +218,7 @@ public void TestPrimary()
         public void TestReconnect()
         {
             _server.Reconnect();
-            Assert.AreEqual(MongoServerState.Connected, _server.State);
+            Assert.IsTrue(_server.State == MongoServerState.Connected || _server.State == MongoServerState.ConnectedToSubset);
         }
 
         [Test]