mongo 2.13.0.beta1 → 2.14.0

data/spec/mongo/client_encryption_spec.rb

@@ -268,7 +268,7 @@ describe Mongo::ClientEncryption do
         it_behaves_like 'it creates a data key'
       end
 
-      context 'with invalid endpoint' do
+      context 'with https' do
         let(:options) do
           {
             master_key: {
@@ -279,20 +279,26 @@ describe Mongo::ClientEncryption do
           }
         end
 
-        let(:expected_message) do
-          # RUBY-2129: This error message could be more specific and inform the user
-          # that there is a problem with their KMS endpoint
-          if BSON::Environment.jruby?
-            /getservbyname.* failed/
-          else
-            /SocketError/
-          end
+        it_behaves_like 'it creates a data key'
+      end
+
+      context 'with invalid endpoint' do
+        let(:options) do
+          {
+            master_key: {
+              key: aws_arn,
+              region: aws_region,
+              endpoint: "invalid-nonsense-endpoint.com"
+            }
+          }
         end
 
         it 'raises an exception' do
+          # RUBY-2129: This error message could be more specific and inform the user
+          # that there is a problem with their KMS endpoint
           expect do
             data_key_id
-          end.to raise_error(Mongo::Error::KmsError, expected_message)
+          end.to raise_error(Mongo::Error::KmsError, /SocketError/)
         end
       end
 

data/spec/mongo/client_spec.rb

@@ -595,6 +595,21 @@ describe Mongo::Client do
     end
 
     context 'when name_only is true' do
+      min_server_fcv '3.6'
+
+      let(:command) do
+        Utils.get_command_event(root_authorized_client, 'listDatabases') do |client|
+          client.list_databases({}, true)
+        end.command
+      end
+
+      it 'sends the command with the nameOnly flag set to true' do
+        expect(command[:nameOnly]).to be(true)
+      end
+    end
+
+    context 'when authorized_databases is provided' do
+      min_server_fcv '4.0'
 
       let(:client_options) do
         root_authorized_client.options.merge(heartbeat_frequency: 100, monitoring: true)
@@ -614,12 +629,32 @@ describe Mongo::Client do
         subscriber.started_events.find { |c| c.command_name == 'listDatabases' }.command
       end
 
+      let(:authDb) do
+        { authorized_databases: true }
+      end
+
+      let(:noAuthDb) do
+        { authorized_databases: false }
+      end
+
       before do
-        client.list_databases({}, true)
+        client.list_databases({}, true, authDb)
+        client.list_databases({}, true, noAuthDb)
       end
 
-      it 'sends the command with the nameOnly flag set to true' do
-        expect(command[:nameOnly]).to be(true)
+      let(:events) do
+        subscriber.command_started_events('listDatabases')
+      end
+
+      it 'sends the command with the authorizedDatabases flag set to true' do
+        expect(events.length).to eq(2)
+        command = events.first.command
+        expect(command[:authorizedDatabases]).to be(true)
+      end
+
+      it 'sends the command with the authorizedDatabases flag set to nil' do
+        command = events.last.command
+        expect(command[:authorizedDatabases]).to be_nil
       end
     end
   end
@@ -692,6 +727,13 @@ describe Mongo::Client do
       expect(new_id).not_to eql(old_id)
     end
 
+    it 'replaces the session pool' do
+      old_id = client.cluster.session_pool.object_id
+      client.reconnect
+      new_id = client.cluster.session_pool.object_id
+      expect(new_id).not_to eql(old_id)
+    end
+
     it 'returns true' do
       expect(client.reconnect).to be(true)
     end
@@ -859,4 +901,44 @@ describe Mongo::Client do
       end
     end
   end
+
+  describe '#summary' do
+
+    context 'monitoring omitted' do
+      let(:client) do
+        new_local_client_nmio(
+          ['127.0.0.1:27017'],
+          :read => { :mode => :primary },
+          :database => SpecConfig.instance.test_db
+        )
+      end
+
+      it 'indicates lack of monitoring' do
+        client.summary.should =~ /servers=.*UNKNOWN.*NO-MONITORING/
+      end
+    end
+
+    context 'monitoring present' do
+      let(:client) do
+        authorized_client
+      end
+
+      it 'does not indicate lack of monitoring' do
+        client.summary.should =~ /servers=.*(STANDALONE|PRIMARY|MONGOS)/
+        client.summary.should_not =~ /servers=.*(STANDALONE|PRIMARY|MONGOS).*NO-MONITORING/
+      end
+    end
+
+    context 'background threads killed' do
+      let(:client) do
+        authorized_client.tap do |client|
+          client.cluster.servers.map(&:disconnect!)
+        end
+      end
+
+      it 'does not indicate lack of monitoring' do
+        client.summary.should =~ /servers=.*(STANDALONE|PRIMARY|MONGOS).*NO-MONITORING/
+      end
+    end
+  end
 end

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

@@ -150,7 +150,13 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
     end
 
     let(:cluster) do
-      double('cluster', servers: servers, single?: false, sharded?: false, unknown?: false)
+      double('cluster',
+        servers: servers,
+        single?: false,
+        replica_set?: true,
+        sharded?: false,
+        unknown?: false,
+      )
     end
 
     context 'when the read preference is primary' do
@@ -162,7 +168,11 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       context 'when a primary exists' do
 
         let(:servers) do
-          [ double('server', primary?: true) ]
+          [ double('server',
+            primary?: true,
+            # for runs with linting enabled
+            average_round_trip_time: 42,
+          ) ]
         end
 
         it 'returns true' do
@@ -191,7 +201,12 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       context 'when a primary exists' do
 
         let(:servers) do
-          [ double('server', primary?: true, secondary?: false) ]
+          [ double('server',
+            primary?: true,
+            secondary?: false,
+            # for runs with linting enabled
+            average_round_trip_time: 42,
+          ) ]
         end
 
         it 'returns true' do
@@ -260,7 +275,12 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       context 'when a secondary does not exist' do
 
         let(:servers) do
-          [ double('server', secondary?: false, primary?: true) ]
+          [ double('server',
+            secondary?: false,
+            primary?: true,
+            # for runs with linting enabled
+            average_round_trip_time: 42,
+          ) ]
         end
 
         it 'returns true' do
@@ -289,7 +309,12 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       context 'when a primary exists' do
 
         let(:servers) do
-          [ double('server', primary?: true, secondary?: false) ]
+          [ double('server',
+            primary?: true,
+            secondary?: false,
+            # for runs with linting enabled
+            average_round_trip_time: 42,
+          ) ]
         end
 
         it 'returns true' do
@@ -319,15 +344,28 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
     context 'when a primary server exists' do
 
       let(:primary) do
-        double('server', :primary? => true)
+        double('server',
+          :primary? => true,
+          # for runs with linting enabled
+          average_round_trip_time: 42,
+        )
       end
 
       let(:secondary) do
-        double('server', :primary? => false)
+        double('server',
+          :primary? => false,
+          # for runs with linting enabled
+          average_round_trip_time: 42,
+        )
       end
 
       let(:cluster) do
-        double('cluster', servers: [ primary, secondary ])
+        double('cluster',
+          single?: false,
+          replica_set?: true,
+          sharded?: false,
+          servers: [ primary, secondary ],
+        )
       end
 
       it 'returns true' do
@@ -342,7 +380,12 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       end
 
       let(:cluster) do
-        double('cluster', servers: [ server ])
+        double('cluster',
+          single?: false,
+          replica_set?: true,
+          sharded?: false,
+          servers: [ server ],
+        )
       end
 
       it 'returns false' do
@@ -522,7 +565,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

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

@@ -135,7 +135,7 @@ describe Mongo::Cluster::Topology::Sharded do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc1) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

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

@@ -87,8 +87,10 @@ describe Mongo::Cluster::Topology::Single do
       topology.servers([ mongos, standalone, standalone_two, replica_set ])
     end
 
-    it 'returns only the first standalone server' do
-      expect(servers).to eq([ standalone ])
+    it 'returns all data-bearing non-unknown servers' do
+      # mongos and replica_set do not have ok: 1 in their descriptions,
+      # and are considered unknown.
+      expect(servers).to eq([ standalone, standalone_two ])
     end
   end
 
@@ -111,19 +113,28 @@ describe Mongo::Cluster::Topology::Single do
           monitoring, temp_cluster)
       end
 
+      let(:server_1) do
+        double('server').tap do |server|
+          allow(server).to receive(:address).and_return(Mongo::Address.new('one'))
+        end
+      end
+
+      let(:server_2) do
+        double('server').tap do |server|
+          allow(server).to receive(:address).and_return(Mongo::Address.new('two'))
+        end
+      end
+
       let(:temp_cluster) do
         double('temp cluster').tap do |cluster|
-          allow(cluster).to receive(:servers_list).and_return([
-            double('server'),
-            double('server'),
-          ])
+          allow(cluster).to receive(:servers_list).and_return([server_1, server_2])
         end
       end
 
       it 'fails' do
         expect do
           topology
-        end.to raise_error(ArgumentError, 'Cannot instantiate a single topology with more than one server in the cluster')
+        end.to raise_error(ArgumentError, /Cannot instantiate a single topology with more than one server in the cluster: one, two/)
       end
     end
   end
@@ -164,7 +175,7 @@ describe Mongo::Cluster::Topology::Single do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

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

@@ -86,7 +86,7 @@ describe Mongo::Cluster::Topology::Unknown do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

data/spec/mongo/cluster/topology_spec.rb

@@ -111,7 +111,7 @@ describe Mongo::Cluster::Topology do
   end
 
   describe '#logical_session_timeout' do
-    skip_if_linting
+    require_no_linting
 
     let(:listeners) do
       Mongo::Event::Listeners.new

data/spec/mongo/cluster_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'runners/sdam_monitoring'
 
 describe Mongo::Cluster do
 
@@ -179,6 +178,9 @@ describe Mongo::Cluster do
     before do
       expect(server).to receive(:monitor).at_least(:once).and_return(monitor)
       expect(monitor).to receive(:scan!)
+
+      # scan! complains that there isn't a monitor on the server, calls summary
+      allow(monitor).to receive(:running?)
     end
 
     it 'returns true' do
@@ -344,13 +346,13 @@ describe Mongo::Cluster do
       end
 
       let(:monitoring) { Mongo::Monitoring.new }
-      let(:subscriber) { Mongo::SDAMMonitoring::TestSubscriber.new }
+      let(:subscriber) { EventSubscriber.new }
 
       it 'publishes server closed event once' do
         monitoring.subscribe(Mongo::Monitoring::SERVER_CLOSED, subscriber)
         expect(cluster.disconnect!).to be(true)
         expect(subscriber.first_event('server_closed_event')).not_to be nil
-        subscriber.events.clear
+        subscriber.succeeded_events.clear
         expect(cluster.disconnect!).to be(true)
         expect(subscriber.first_event('server_closed_event')).to be nil
       end
@@ -595,7 +597,23 @@ describe Mongo::Cluster do
     end
   end
 
-  describe '#sessions_supported?' do
+  describe '#validate_session_support!' do
+    shared_examples 'supports sessions' do
+      it 'supports sessions' do
+        lambda do
+          cluster.validate_session_support!
+        end.should_not raise_error
+      end
+    end
+
+    shared_examples 'does not support sessions' do
+      it 'does not support sessions' do
+        lambda do
+          cluster.validate_session_support!
+        end.should raise_error(Mongo::Error::SessionsNotSupported)
+      end
+    end
+
     context 'when client has not contacted any servers' do
 
       let(:cluster) do
@@ -604,9 +622,7 @@ describe Mongo::Cluster do
             monitoring_io: false, server_selection_timeout: 0.183))
       end
 
-      it 'is false' do
-        expect(cluster.send(:sessions_supported?)).to be false
-      end
+      it_behaves_like 'does not support sessions'
     end
 
     context 'when client has contacted servers and then disconnected' do
@@ -629,22 +645,20 @@ describe Mongo::Cluster do
         cluster.servers_list.map(&:unknown!)
       end
 
-      it 'is true' do
-        expect(cluster.send(:sessions_supported?)).to be true
-      end
+      it_behaves_like 'supports sessions'
     end
 
     context 'in server < 3.6' do
       max_server_version '3.4'
 
+      let(:cluster) { client.cluster }
+
       context 'in single topology' do
         require_topology :single
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is false' do
-          expect(client.cluster.send(:sessions_supported?)).to be false
-        end
+        it_behaves_like 'does not support sessions'
       end
 
       context 'in single topology with replica set name set' do
@@ -656,9 +670,7 @@ describe Mongo::Cluster do
               connect: :direct, replica_set: ClusterConfig.instance.replica_set_name))
         end
 
-        it 'is false' do
-          expect(client.cluster.send(:sessions_supported?)).to be false
-        end
+        it_behaves_like 'does not support sessions'
       end
 
       context 'in replica set topology' do
@@ -666,9 +678,7 @@ describe Mongo::Cluster do
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is false' do
-          expect(client.cluster.send(:sessions_supported?)).to be false
-        end
+        it_behaves_like 'does not support sessions'
       end
 
       context 'in sharded topology' do
@@ -676,15 +686,15 @@ describe Mongo::Cluster do
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is false' do
-          expect(client.cluster.send(:sessions_supported?)).to be false
-        end
+        it_behaves_like 'does not support sessions'
       end
     end
 
     context 'in server 3.6+' do
       min_server_fcv '3.6'
 
+      let(:cluster) { client.cluster }
+
       context 'in single topology' do
         require_topology :single
 
@@ -692,10 +702,8 @@ describe Mongo::Cluster do
 
         # Contrary to the session spec, 3.6 and 4.0 standalone servers
         # report a logical session timeout and thus are considered to
-        # support sessions
-        it 'is true' do
-          expect(client.cluster.send(:sessions_supported?)).to be true
-        end
+        # support sessions.
+        it_behaves_like 'supports sessions'
       end
 
       context 'in single topology with replica set name set' do
@@ -707,9 +715,7 @@ describe Mongo::Cluster do
               connect: :direct, replica_set: ClusterConfig.instance.replica_set_name))
         end
 
-        it 'is true' do
-          expect(client.cluster.send(:sessions_supported?)).to be true
-        end
+        it_behaves_like 'supports sessions'
       end
 
       context 'in replica set topology' do
@@ -717,9 +723,7 @@ describe Mongo::Cluster do
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is true' do
-          expect(client.cluster.send(:sessions_supported?)).to be true
-        end
+        it_behaves_like 'supports sessions'
       end
 
       context 'in sharded topology' do
@@ -727,9 +731,7 @@ describe Mongo::Cluster do
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is true' do
-          expect(client.cluster.send(:sessions_supported?)).to be true
-        end
+        it_behaves_like 'supports sessions'
       end
     end
   end