mongo 2.10.5 → 2.11.0.rc0

data/spec/mongo/cluster/topology/replica_set_spec.rb

@@ -34,22 +34,34 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
 
     let(:mongos) do
       Mongo::Server.new(address, cluster, monitoring, listeners,
-        SpecConfig.instance.test_options.merge(monitoring_io: false))
+        SpecConfig.instance.test_options.merge(monitoring_io: false)
+      ).tap do |server|
+        allow(server).to receive(:description).and_return(mongos_description)
+      end
     end
 
     let(:standalone) do
       Mongo::Server.new(address, cluster, monitoring, listeners,
-        SpecConfig.instance.test_options.merge(monitoring_io: false))
+        SpecConfig.instance.test_options.merge(monitoring_io: false)
+      ).tap do |server|
+        allow(server).to receive(:description).and_return(standalone_description)
+      end
     end
 
     let(:replica_set) do
       Mongo::Server.new(address, cluster, monitoring, listeners,
-        SpecConfig.instance.test_options.merge(monitoring_io: false))
+        SpecConfig.instance.test_options.merge(monitoring_io: false)
+      ).tap do |server|
+        allow(server).to receive(:description).and_return(replica_set_description)
+      end
     end
 
     let(:replica_set_two) do
       Mongo::Server.new(address, cluster, monitoring, listeners,
-        SpecConfig.instance.test_options.merge(monitoring_io: false))
+        SpecConfig.instance.test_options.merge(monitoring_io: false)
+      ).tap do |server|
+        allow(server).to receive(:description).and_return(replica_set_two_description)
+      end
     end
 
     let(:mongos_description) do
@@ -74,13 +86,6 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
         'setName' => 'test', 'ok' => 1 })
     end
 
-    before do
-      mongos.monitor.instance_variable_set(:@description, mongos_description)
-      standalone.monitor.instance_variable_set(:@description, standalone_description)
-      replica_set.monitor.instance_variable_set(:@description, replica_set_description)
-      replica_set_two.monitor.instance_variable_set(:@description, replica_set_two_description)
-    end
-
     context 'when a replica set name is provided' do
 
       let(:topology) do

data/spec/mongo/cluster/topology/sharded_spec.rb

@@ -36,17 +36,26 @@ describe Mongo::Cluster::Topology::Sharded do
 
   let(:mongos) do
     Mongo::Server.new(address, cluster, monitoring, listeners,
-      SpecConfig.instance.test_options.merge(monitoring_io: false))
+      SpecConfig.instance.test_options.merge(monitoring_io: false)
+    ).tap do |server|
+      allow(server).to receive(:description).and_return(mongos_description)
+    end
   end
 
   let(:standalone) do
     Mongo::Server.new(address, cluster, monitoring, listeners,
-      SpecConfig.instance.test_options.merge(monitoring_io: false))
+      SpecConfig.instance.test_options.merge(monitoring_io: false)
+    ).tap do |server|
+      allow(server).to receive(:description).and_return(standalone_description)
+    end
   end
 
   let(:replica_set) do
     Mongo::Server.new(address, cluster, monitoring, listeners,
-      SpecConfig.instance.test_options.merge(monitoring_io: false))
+      SpecConfig.instance.test_options.merge(monitoring_io: false)
+    ).tap do |server|
+      allow(server).to receive(:description).and_return(replica_set_description)
+    end
   end
 
   let(:mongos_description) do
@@ -81,12 +90,6 @@ describe Mongo::Cluster::Topology::Sharded do
 
   describe '.servers' do
 
-    before do
-      mongos.monitor.instance_variable_set(:@description, mongos_description)
-      standalone.monitor.instance_variable_set(:@description, standalone_description)
-      replica_set.monitor.instance_variable_set(:@description, replica_set_description)
-    end
-
     let(:servers) do
       topology.servers([ mongos, standalone, replica_set ])
     end

data/spec/mongo/cluster/topology/single_spec.rb

@@ -37,19 +37,35 @@ describe Mongo::Cluster::Topology::Single do
   describe '.servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+      Mongo::Server.new(address, cluster, monitoring, listeners,
+        SpecConfig.instance.test_options.merge(monitoring_io: false)
+      ).tap do |server|
+        allow(server).to receive(:description).and_return(mongos_description)
+      end
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+      Mongo::Server.new(address, cluster, monitoring, listeners,
+        SpecConfig.instance.test_options.merge(monitoring_io: false)
+      ).tap do |server|
+        allow(server).to receive(:description).and_return(standalone_description)
+      end
     end
 
     let(:standalone_two) do
-      Mongo::Server.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+      Mongo::Server.new(address, cluster, monitoring, listeners,
+        SpecConfig.instance.test_options.merge(monitoring_io: false)
+      ).tap do |server|
+        allow(server).to receive(:description).and_return(standalone_description)
+      end
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+      Mongo::Server.new(address, cluster, monitoring, listeners,
+        SpecConfig.instance.test_options.merge(monitoring_io: false)
+      ).tap do |server|
+        allow(server).to receive(:description).and_return(replica_set_description)
+      end
     end
 
     let(:mongos_description) do
@@ -67,13 +83,6 @@ describe Mongo::Cluster::Topology::Single do
         'setName' => 'testing' })
     end
 
-    before do
-      mongos.monitor.instance_variable_set(:@description, mongos_description)
-      standalone.monitor.instance_variable_set(:@description, standalone_description)
-      standalone_two.monitor.instance_variable_set(:@description, standalone_description)
-      replica_set.monitor.instance_variable_set(:@description, replica_set_description)
-    end
-
     let(:servers) do
       topology.servers([ mongos, standalone, standalone_two, replica_set ])
     end

data/spec/mongo/cluster_spec.rb

@@ -7,9 +7,10 @@ describe Mongo::Cluster do
   end
 
   let(:cluster_with_semaphore) do
-    described_class.new(SpecConfig.instance.addresses, monitoring,
-      SpecConfig.instance.test_options.merge(
-        server_selection_semaphore: Mongo::Semaphore.new))
+    register_cluster(
+      described_class.new(SpecConfig.instance.addresses, monitoring,
+        SpecConfig.instance.test_options.merge(
+          server_selection_semaphore: Mongo::Semaphore.new)))
   end
 
   let(:cluster_without_io) do
@@ -19,25 +20,6 @@ describe Mongo::Cluster do
 
   let(:cluster) { cluster_without_io }
 
-  describe 'initialize' do
-
-    context 'when there are duplicate addresses' do
-
-      let(:addresses) do
-        SpecConfig.instance.addresses + SpecConfig.instance.addresses
-      end
-      let(:cluster_with_dup_addresses) do
-        described_class.new(addresses, monitoring, SpecConfig.instance.test_options.merge(
-          server_selection_semaphore: Mongo::Semaphore.new))
-      end
-
-      it 'does not raise an exception' do
-        expect { cluster_with_dup_addresses }.not_to raise_error
-      end
-    end
-
-  end
-
   describe '#==' do
 
     context 'when the other is a cluster' do
@@ -167,8 +149,15 @@ describe Mongo::Cluster do
       cluster.instance_variable_get(:@servers)
     end
 
+    let(:server) { known_servers.first }
+
+    let(:monitor) do
+      double('monitor')
+    end
+
     before do
-      expect(known_servers.first).to receive(:scan!).and_call_original
+      expect(server).to receive(:monitor).at_least(:once).and_return(monitor)
+      expect(monitor).to receive(:scan!)
     end
 
     it 'returns true' do
@@ -278,6 +267,27 @@ describe Mongo::Cluster do
         expect(cluster.servers[0].address.seed).to_not eq('a')
       end
     end
+
+    context 'topology is Sharded' do
+
+      let(:topology) do
+        Mongo::Cluster::Topology::Single.new({}, cluster)
+      end
+
+      before do
+        cluster.add('a')
+      end
+
+      it 'creates server with nil last_scan' do
+        server = cluster.servers_list.detect do |server|
+          server.address.seed == 'a'
+        end
+
+        expect(server).not_to be nil
+
+        expect(server.last_scan).to be nil
+      end
+    end
   end
 
   describe '#disconnect!' do
@@ -349,11 +359,11 @@ describe Mongo::Cluster do
   describe '#remove' do
 
     let(:address_a) do
-      Mongo::Address.new('127.0.0.1:27017')
+      Mongo::Address.new('127.0.0.1:25555')
     end
 
     let(:address_b) do
-      Mongo::Address.new('127.0.0.1:27018')
+      Mongo::Address.new('127.0.0.1:25556')
     end
 
     let(:monitoring) do
@@ -361,11 +371,15 @@ describe Mongo::Cluster do
     end
 
     let(:server_a) do
-      Mongo::Server.new(address_a, cluster, monitoring, Mongo::Event::Listeners.new)
+      register_server(
+        Mongo::Server.new(address_a, cluster, monitoring, Mongo::Event::Listeners.new,
+          monitor: false))
     end
 
     let(:server_b) do
-      Mongo::Server.new(address_b, cluster, monitoring, Mongo::Event::Listeners.new)
+      register_server(
+        Mongo::Server.new(address_b, cluster, monitoring, Mongo::Event::Listeners.new,
+          monitor: false))
     end
 
     let(:servers) do
@@ -378,7 +392,7 @@ describe Mongo::Cluster do
 
     before do
       cluster.instance_variable_set(:@servers, servers)
-      cluster.remove('127.0.0.1:27017')
+      cluster.remove('127.0.0.1:25555')
     end
 
     it 'removes the host from the list of servers' do
@@ -393,7 +407,9 @@ describe Mongo::Cluster do
   describe '#next_primary' do
 
     let(:cluster) do
-      authorized_client.cluster
+      # We use next_primary to wait for server selection, and this is
+      # also the method we are testing.
+      authorized_client.tap { |client| client.cluster.next_primary }.cluster
     end
 
     let(:primary_candidates) do

data/spec/mongo/collection/view/map_reduce_spec.rb

@@ -576,13 +576,20 @@ describe Mongo::Collection::View::MapReduce do
       end
 
       context 'when the server is not a valid for writing' do
+        clean_slate
+
+        before do
+          stop_monitoring(authorized_client)
+        end
 
         it 'reroutes the operation to a primary' do
-          allow(map_reduce).to receive(:valid_server?).and_return(false)
-          expect(Mongo::Logger.logger).to receive(:warn).once do |msg|
-            expect(msg).to include('Rerouting the MapReduce operation to the primary server')
+          RSpec::Mocks.with_temporary_scope do
+            allow(map_reduce).to receive(:valid_server?).and_return(false)
+            expect(Mongo::Logger.logger).to receive(:warn).once do |msg|
+              expect(msg).to include('Rerouting the MapReduce operation to the primary server')
+            end
+            map_reduce.to_a
           end
-          map_reduce.to_a
         end
 
         context 'when the view has a write concern' do
@@ -649,12 +656,10 @@ describe Mongo::Collection::View::MapReduce do
       end
 
       context 'when the server is a valid for writing' do
+        clean_slate
+
         before do
-          # We are inspecting server state - kill monitor threads so that
-          # server state is not changed in background due to intermittent
-          # connectivity issues in Evergreen
-          ClientRegistry.instance.close_all_clients
-          authorized_collection.client.cluster.disconnect!
+          stop_monitoring(authorized_client)
         end
 
         it 'does not reroute the operation to a primary' do

data/spec/mongo/collection/view/readable_spec.rb

@@ -368,10 +368,6 @@ describe Mongo::Collection::View::Readable do
 
     context 'when the collection has a read preference set' do
 
-      after do
-        client.close(true)
-      end
-
       let(:client) do
         # Set a timeout in case the collection read_preference does get used.
         # Otherwise, the test will hang for 30 seconds.
@@ -437,10 +433,6 @@ describe Mongo::Collection::View::Readable do
       context 'when the collection does not have a read preference set' do
         require_topology :single, :replica_set
 
-        after do
-          client.close(true)
-        end
-
         let(:client) do
           authorized_client.with(server_selection_timeout: 1)
         end
@@ -755,10 +747,6 @@ describe Mongo::Collection::View::Readable do
         authorized_collection.insert_many(documents)
       end
 
-      after do
-        client.close(true)
-      end
-
       let(:client) do
         # Set a timeout in case the collection read_preference does get used.
         # Otherwise, the test will hang for 30 seconds.
@@ -818,10 +806,6 @@ describe Mongo::Collection::View::Readable do
           allow(view.collection.client.cluster).to receive(:single?).and_return(false)
         end
 
-        after do
-          client.close(true)
-        end
-
         let(:client) do
           authorized_client.with(server_selection_timeout: 1)
         end

data/spec/mongo/collection_spec.rb

@@ -945,30 +945,6 @@ describe Mongo::Collection do
         it_behaves_like 'a failed operation using a session'
       end
     end
-
-    context 'when collation has a strength' do
-      min_server_fcv '3.4'
-
-      let(:band_collection) do
-        described_class.new(database, :bands)
-      end
-
-      before do
-        band_collection.delete_many
-        band_collection.insert_many([{ name: "Depeche Mode" }, { name: "New Order" }])
-      end
-
-      let(:options) do
-        { collation: { locale: 'en_US', strength: 2 } }
-      end
-      let(:band_result) do
-        band_collection.find({ name: 'DEPECHE MODE' }, options)
-      end
-
-      it 'finds Capitalize from UPPER CASE' do
-        expect(band_result.count_documents).to eq(1)
-      end
-    end
   end
 
   describe '#drop' do
@@ -1513,10 +1489,6 @@ describe Mongo::Collection do
         expect(custom_collection.count).to eq(1)
       end
 
-      after do
-        custom_client.close(true)
-      end
-
       it 'inserts with the custom id' do
         expect(custom_collection.count).to eq(1)
         expect(custom_collection.find.first[:_id]).to eq(1)
@@ -1564,10 +1536,6 @@ describe Mongo::Collection do
         client[TEST_COLL].insert_many(documents)
       end
 
-      after do
-        client.close(true)
-      end
-
       let(:insert_events) do
         EventSubscriber.started_events.select { |e| e.command_name == 'insert' }
       end
@@ -1777,10 +1745,6 @@ describe Mongo::Collection do
         custom_collection.insert_one({ name: 'testing' })
       end
 
-      after do
-        custom_client.close(true)
-      end
-
       it 'inserts with the custom id' do
         expect(custom_collection.find.first[:_id]).to eq(1)
       end
@@ -2859,10 +2823,6 @@ describe Mongo::Collection do
         allow(collection.client.cluster).to receive(:single?).and_return(false)
       end
 
-      after do
-        client.close(true)
-      end
-
       let(:client) do
         authorized_client.with(server_selection_timeout: 0.2)
       end
@@ -4011,10 +3971,6 @@ describe Mongo::Collection do
         client[TEST_COLL].update_one({ a: 1 }, {'$set' => { 'name' => '1'*16777149 }})
       end
 
-      after do
-        client.close(true)
-      end
-
       let(:update_events) do
         EventSubscriber.started_events.select { |e| e.command_name == 'update' }
       end