mongo 2.13.0.beta1 → 2.14.0

data/spec/mongo/server/connection_auth_spec.rb

@@ -65,7 +65,7 @@ describe Mongo::Server::Connection, retry: 3 do
         SpecConfig.instance.test_options.merge(
           user: SpecConfig.instance.test_user.name,
           password: SpecConfig.instance.test_user.password,
-          auth_source: SpecConfig.instance.test_db,
+          auth_source: 'admin',
         )
       end
 
@@ -74,7 +74,7 @@ describe Mongo::Server::Connection, retry: 3 do
       end
 
       before do
-        client = authorized_client.with(database: SpecConfig.instance.test_db)
+        client = authorized_client.with(database: 'admin')
         info = client.database.users.info(SpecConfig.instance.test_user.name)
         expect(info.length).to eq(1)
         # this before block may have made 2 or 3 clients

data/spec/mongo/server/connection_pool_spec.rb

@@ -5,9 +5,13 @@ describe Mongo::Server::ConnectionPool do
   let(:options) { {} }
 
   let(:server_options) do
-    SpecConfig.instance.ssl_options.merge(SpecConfig.instance.compressor_options)
-      .merge(SpecConfig.instance.retry_writes_options).merge(SpecConfig.instance.auth_options)
-      .merge(options)
+    Mongo::Utils.shallow_symbolize_keys(Mongo::Client.canonicalize_ruby_options(
+      SpecConfig.instance.all_test_options,
+    )).tap do |opts|
+      opts.delete(:min_pool_size)
+      opts.delete(:max_pool_size)
+      opts.delete(:wait_queue_timeout)
+    end.update(options)
   end
 
   let(:address) do

data/spec/mongo/server/connection_spec.rb

@@ -158,6 +158,8 @@ describe Mongo::Server::Connection do
       end
 
       shared_examples_for 'logs a warning' do
+        require_warning_clean
+
         it 'logs a warning' do
           messages = []
           expect(Mongo::Logger.logger).to receive(:warn) do |msg|
@@ -172,6 +174,8 @@ describe Mongo::Server::Connection do
       end
 
       shared_examples_for 'adds server diagnostics' do
+        require_warning_clean
+
         it 'adds server diagnostics' do
           messages = []
           expect(Mongo::Logger.logger).to receive(:warn) do |msg|
@@ -248,8 +252,9 @@ describe Mongo::Server::Connection do
         require_auth
 
         let(:server_options) do
-          SpecConfig.instance.test_options.merge(monitoring_io: false).
-            merge(SpecConfig.instance.auth_options)
+          Mongo::Client.canonicalize_ruby_options(
+            SpecConfig.instance.all_test_options,
+          ).update(monitoring_io: false)
         end
 
         let(:exception) do
@@ -589,10 +594,12 @@ describe Mongo::Server::Connection do
         server,
         SpecConfig.instance.test_options.merge(
           :database => SpecConfig.instance.test_user.database,
-        ).merge(SpecConfig.instance.credentials_or_external_user(
-          user: SpecConfig.instance.test_user.name,
-          password: SpecConfig.instance.test_user.password,
-        ))
+        ).merge(Mongo::Utils.shallow_symbolize_keys(Mongo::Client.canonicalize_ruby_options(
+          SpecConfig.instance.credentials_or_external_user(
+            user: SpecConfig.instance.test_user.name,
+            password: SpecConfig.instance.test_user.password,
+          ),
+        )))
       ).tap do |connection|
         connection.connect!
       end
@@ -767,7 +774,7 @@ describe Mongo::Server::Connection do
       context 'when the message is a command' do
         # Server description is frozen when linting is enabled, which is
         # incompatible with expectations set on it in this test
-        skip_if_linting
+        require_no_linting
 
         let(:selector) do
           # The driver allows up to 16KiB for command overhead on top of
@@ -1099,7 +1106,7 @@ describe Mongo::Server::Connection do
           :user => SpecConfig.instance.test_user.name,
           :password => SpecConfig.instance.test_user.password,
           :database => SpecConfig.instance.test_db,
-          :auth_mech => :mongodb_cr
+          :auth_mech => :mongodb_cr,
         )
       end
 

data/spec/mongo/server/description_spec.rb

@@ -27,6 +27,7 @@ describe Mongo::Server::Description do
       'logicalSessionTimeoutMinutes' => 7,
       'operationTime' => 1,
       '$clusterTime' => 1,
+      'connectionId' => 11,
       'ok' => 1
     }
   end
@@ -757,6 +758,23 @@ describe Mongo::Server::Description do
       end
     end
 
+    context 'when the configs match, but have different connectionId values' do
+
+      let(:description) do
+        described_class.new(address, replica)
+      end
+
+      let(:other) do
+        described_class.new(address, replica.merge(
+          'connectionId' => 12
+        ))
+      end
+
+      it 'returns true' do
+        expect(description == other).to be(true)
+      end
+    end
+
     context 'when the configs do not match' do
 
       let(:description) do

data/spec/mongo/server_selector/nearest_spec.rb

@@ -114,13 +114,13 @@ describe Mongo::ServerSelector::Nearest do
     end
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
 
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -128,7 +128,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
       end
     end
 
@@ -136,7 +136,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [secondary] }
 
       it 'returns an array with the secondary' do
-        expect(selector.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
       end
     end
 
@@ -144,7 +144,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [primary, secondary] }
 
       it 'returns an array with the primary and secondary' do
-        expect(selector.send(:select, candidates)).to match_array([primary, secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to match_array([primary, secondary])
       end
     end
 
@@ -152,7 +152,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [secondary, secondary] }
 
       it 'returns an array with the secondaries' do
-        expect(selector.send(:select, candidates)).to match_array([secondary, secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to match_array([secondary, secondary])
       end
     end
 
@@ -171,7 +171,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -179,7 +179,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_primary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -187,7 +187,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -195,7 +195,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_secondary] }
 
           it 'returns an array with the matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
       end
@@ -206,7 +206,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -214,7 +214,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_primary, secondary, secondary] }
 
           it 'returns an array with the matching primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -222,7 +222,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, matching_secondary, secondary] }
 
           it 'returns an array with the matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -231,7 +231,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [matching_secondary, matching_secondary] }
 
           it 'returns an array with the matching secondaries' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -240,7 +240,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [matching_primary, matching_secondary] }
 
           it 'returns an array with the matching primary and secondary' do
-            expect(selector.send(:select, candidates)).to match_array(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to match_array(expected)
           end
         end
       end
@@ -256,7 +256,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_primary] }
 
           it 'returns array with far primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -264,7 +264,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_secondary] }
 
           it 'returns array with far primary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -275,7 +275,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, secondary] }
 
           it 'returns array with primary and secondary' do
-            expect(selector.send(:select, candidates)).to match_array(
+            expect(selector.send(:select_in_replica_set, candidates)).to match_array(
               [primary, secondary]
             )
           end
@@ -285,7 +285,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns array with local primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -293,7 +293,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_primary, secondary] }
 
           it 'returns array with local secondary' do
-            expect(selector.send(:select, candidates)).to eq([secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
           end
         end
 
@@ -302,7 +302,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [far_primary, far_secondary] }
 
           it 'returns array with both servers' do
-            expect(selector.send(:select, candidates)).to match_array(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to match_array(expected)
           end
         end
 
@@ -313,7 +313,7 @@ describe Mongo::ServerSelector::Nearest do
             let(:expected) { [primary, secondary] }
 
             it 'returns array with local primary and local secondary' do
-              expect(selector.send(:select, candidates)).to match_array(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to match_array(expected)
             end
           end
 
@@ -322,7 +322,7 @@ describe Mongo::ServerSelector::Nearest do
             let(:expected) { [secondary, secondary] }
 
             it 'returns array with the two local secondaries' do
-              expect(selector.send(:select, candidates)).to match_array(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to match_array(expected)
             end
           end
         end

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -107,13 +107,13 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     end
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
 
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -121,7 +121,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:candidates) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq( [primary] )
+        expect(selector.send(:select_in_replica_set, candidates)).to eq( [primary] )
       end
     end
 
@@ -129,7 +129,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:candidates) { [secondary] }
 
       it 'returns an array with the secondary' do
-        expect(selector.send(:select, candidates)).to eq( [secondary] )
+        expect(selector.send(:select_in_replica_set, candidates)).to eq( [secondary] )
       end
     end
 
@@ -138,7 +138,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:expected) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
       end
     end
 
@@ -147,7 +147,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:expected) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
       end
     end
 
@@ -168,7 +168,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [primary] }
 
           it 'returns array with primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -176,7 +176,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_primary] }
 
           it 'returns array with matching primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -184,7 +184,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_secondary] }
 
           it 'returns array with matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -192,7 +192,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
       end
@@ -203,7 +203,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -211,7 +211,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_primary, secondary, secondary] }
 
           it 'returns an array of the primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -220,7 +220,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -229,7 +229,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary ' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -238,7 +238,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
       end
@@ -254,7 +254,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [far_primary] }
 
           it 'returns array with far primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -262,7 +262,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [far_secondary] }
 
           it 'returns array with far primary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
 
         end
@@ -277,7 +277,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [primary] }
 
             it 'returns an array of the primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -286,7 +286,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [primary] }
 
             it 'returns an array of the primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -295,7 +295,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [far_primary] }
 
             it 'returns an array of the far primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -304,7 +304,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [far_primary] }
 
             it 'returns an array of the far primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -315,7 +315,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
               let(:expected) { [primary] }
 
               it 'returns an array of the primary' do
-                expect(selector.send(:select, candidates)).to eq(expected)
+                expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
               end
             end
 
@@ -324,7 +324,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
               let(:expected) { [far_primary] }
 
               it 'returns an array with primary' do
-                expect(selector.send(:select, candidates)).to eq(expected)
+                expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
               end
             end
           end
@@ -337,7 +337,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary] }
 
             it 'returns an array with the secondary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -346,7 +346,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary] }
 
             it 'returns an array of the secondary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -355,7 +355,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary, secondary] }
 
             it 'returns an array of the secondary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
         end