mongo 2.13.0 → 2.15.0.alpha

data/spec/mongo/retryable_spec.rb

@@ -574,8 +574,9 @@ describe Mongo::Retryable do
     context 'when an error due to using an unsupported storage engine occurs' do
       before do
         expect(operation).to receive(:execute).and_raise(
-          Mongo::Error::OperationFailure.new('Transaction numbers are only allowed on...',
-            nil, :code=>20)).ordered
+          Mongo::Error::OperationFailure.new('message which is not checked',
+            nil, code: 20, server_message: 'Transaction numbers are only allowed on...',
+        )).ordered
       end
 
       it 'raises an exception with the correct error message' do

data/spec/mongo/server/app_metadata_shared.rb

@@ -10,7 +10,7 @@ shared_examples 'app metadata document' do
 
   it 'includes operating system information' do
     document[:client][:os][:type].should == 'linux'
-    if BSON::Environment.jruby?
+    if BSON::Environment.jruby? || RUBY_VERSION >= '3.0'
       document[:client][:os][:name].should == 'linux'
     else
       document[:client][:os][:name].should == 'linux-gnu'
@@ -19,7 +19,7 @@ shared_examples 'app metadata document' do
   end
 
   context 'mri' do
-    only_mri
+    require_mri
 
     it 'includes Ruby version' do
       document[:client][:platform].should start_with("Ruby #{RUBY_VERSION}")

data/spec/mongo/server/app_metadata_spec.rb

@@ -53,6 +53,8 @@ describe Mongo::Server::AppMetadata do
     end
 
     context 'when the client document exceeds the max of 512 bytes' do
+      # Server api parameters change metadata length
+      require_no_required_api_version
 
       context 'when the os.type length is too long' do
 

data/spec/mongo/server/connection_pool/populator_spec.rb

@@ -61,7 +61,9 @@ describe Mongo::Server::Populator do
 
       it 'populates the pool up to min_size' do
         populator.run!
-        sleep 1
+        ::Utils.wait_for_condition(3) do
+          pool.size >= 2
+        end
         expect(pool.size).to eq 2
         expect(populator.running?).to be true
       end

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
@@ -527,7 +531,7 @@ describe Mongo::Server::ConnectionPool do
         authorized_client
       end
 
-       let(:pool) do
+      let(:pool) do
         client.cluster.next_primary.pool
       end
 

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
@@ -584,15 +589,19 @@ describe Mongo::Server::Connection do
 
     let(:server) { monitored_server }
 
+    let(:context) { Mongo::Operation::Context.new }
+
     let!(:connection) do
       described_class.new(
         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
@@ -613,12 +622,12 @@ describe Mongo::Server::Connection do
     context 'when providing a single message' do
 
       let(:reply) do
-        connection.dispatch([ query ])
+        connection.dispatch([ query ], context)
       end
 
       before do
         authorized_collection.delete_many
-        connection.dispatch([ insert ])
+        authorized_collection.insert_one(name: 'testing')
       end
 
       it 'it dispatches the message to the socket' do
@@ -637,7 +646,7 @@ describe Mongo::Server::Connection do
       end
 
       let(:reply) do
-        connection.dispatch([ insert, command ])
+        connection.dispatch([ insert, command ], context)
       end
 
       before do
@@ -674,22 +683,22 @@ describe Mongo::Server::Connection do
       end
 
       before do
-        connection.dispatch([ insert ])
+        connection.dispatch([ insert ], context)
         # Fake a query for which we did not read the response. See RUBY-1117
         allow(query_bob).to receive(:replyable?) { false }
-        connection.dispatch([ query_bob ])
+        connection.dispatch([ query_bob ], context)
       end
 
       it 'raises an UnexpectedResponse error' do
         expect {
-          connection.dispatch([ query_alice ])
+          connection.dispatch([ query_alice ], context)
         }.to raise_error(Mongo::Error::UnexpectedResponse,
           /Got response for request ID \d+ but expected response for request ID \d+/)
       end
 
       it 'marks connection perished' do
         expect {
-          connection.dispatch([ query_alice ])
+          connection.dispatch([ query_alice ], context)
         }.to raise_error(Mongo::Error::UnexpectedResponse)
 
         connection.should be_error
@@ -697,16 +706,17 @@ describe Mongo::Server::Connection do
 
       it 'makes the connection no longer usable' do
         expect {
-          connection.dispatch([ query_alice ])
+          connection.dispatch([ query_alice ], context)
         }.to raise_error(Mongo::Error::UnexpectedResponse)
 
         expect {
-          connection.dispatch([ query_alice ])
+          connection.dispatch([ query_alice ], context)
         }.to raise_error(Mongo::Error::ConnectionPerished)
       end
     end
 
     context 'when a request is interrupted (Thread.kill)' do
+      require_no_required_api_version
 
       let(:documents) do
         [{ 'name' => 'bob' }, { 'name' => 'alice' }]
@@ -726,18 +736,19 @@ describe Mongo::Server::Connection do
 
       before do
         authorized_collection.delete_many
-        connection.dispatch([ insert ])
+        connection.dispatch([ insert ], context)
       end
 
       it 'closes the socket and does not use it for subsequent requests' do
         t = Thread.new {
           # Kill the thread just before the reply is read
           allow(Mongo::Protocol::Reply).to receive(:deserialize_header) { t.kill && !t.alive? }
-          connection.dispatch([ query_bob ])
+          connection.dispatch([ query_bob ], context)
         }
         t.join
         allow(Mongo::Protocol::Message).to receive(:deserialize_header).and_call_original
-        expect(connection.dispatch([ query_alice ]).documents.first['name']).to eq('alice')
+        resp = connection.dispatch([ query_alice ], context)
+        expect(resp.documents.first['name']).to eq('alice')
       end
     end
 
@@ -754,7 +765,7 @@ describe Mongo::Server::Connection do
         end
 
         let(:reply) do
-          connection.dispatch([ insert ])
+          connection.dispatch([ insert ], context)
         end
 
         it 'checks the size against the max message size' do
@@ -767,7 +778,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
@@ -781,7 +792,7 @@ describe Mongo::Server::Connection do
         end
 
         let(:reply) do
-          connection.dispatch([ command ])
+          connection.dispatch([ command ], context)
         end
 
         it 'checks the size against the max bson size' do
@@ -821,7 +832,7 @@ describe Mongo::Server::Connection do
 
         let(:result) do
           expect do
-            connection.dispatch([ insert ])
+            connection.dispatch([ insert ], context)
           end.to raise_error(Mongo::Error::SocketError)
         end
 
@@ -855,7 +866,7 @@ describe Mongo::Server::Connection do
 
         let(:result) do
           expect do
-            connection.dispatch([ insert ])
+            connection.dispatch([ insert ], context)
           end.to raise_error(Mongo::Error::SocketTimeoutError)
         end
 
@@ -899,6 +910,7 @@ describe Mongo::Server::Connection do
       end
 
       before do
+        authorized_collection.insert_one(test: 1)
         client.cluster.next_primary
       end
 
@@ -912,6 +924,8 @@ describe Mongo::Server::Connection do
           end_time = Time.now
           expect(ex).to be_a(Mongo::Error::SocketTimeoutError)
           expect(ex.message).to match(/Took more than 1.5 seconds to receive data/)
+        else
+          fail 'Expected a timeout'
         end
         # allow 1.5 seconds +- 0.5 seconds
         expect(end_time - start).to be_within(1).of(2)
@@ -931,7 +945,7 @@ describe Mongo::Server::Connection do
 
         before do
           expect(message).to receive(:replyable?) { false }
-          connection.send(:deliver, message, nil)
+          connection.send(:deliver, message, context)
 
           connection.send(:socket).instance_variable_set(:@timeout, -(Time.now.to_i))
         end
@@ -1099,7 +1113,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/monitor/connection_spec.rb

@@ -9,13 +9,21 @@ describe Mongo::Server::Monitor::Connection do
 
   declare_topology_double
 
+  let(:monitor_app_metadata) do
+    Mongo::Server::Monitor::AppMetadata.new(
+      server_api: SpecConfig.instance.ruby_options[:server_api],
+    )
+  end
+
   let(:cluster) do
-    double('cluster').tap do |cl|
-      allow(cl).to receive(:topology).and_return(topology)
-      allow(cl).to receive(:app_metadata).and_return(Mongo::Server::Monitor::AppMetadata.new({}))
-      allow(cl).to receive(:options).and_return({})
-      allow(cl).to receive(:heartbeat_interval).and_return(1000)
-      allow(cl).to receive(:run_sdam_flow)
+    double('cluster').tap do |cluster|
+      allow(cluster).to receive(:topology).and_return(topology)
+      allow(cluster).to receive(:app_metadata).and_return(Mongo::Server::Monitor::AppMetadata.new({}))
+      allow(cluster).to receive(:options).and_return({})
+      allow(cluster).to receive(:monitor_app_metadata).and_return(monitor_app_metadata)
+      allow(cluster).to receive(:push_monitor_app_metadata).and_return(monitor_app_metadata)
+      allow(cluster).to receive(:heartbeat_interval).and_return(1000)
+      allow(cluster).to receive(:run_sdam_flow)
     end
   end
 
@@ -27,10 +35,12 @@ describe Mongo::Server::Monitor::Connection do
   end
 
   let(:monitor) do
+    metadata = Mongo::Server::Monitor::AppMetadata.new(options)
     register_background_thread_object(
       Mongo::Server::Monitor.new(server, server.event_listeners, server.monitoring,
         {
-          app_metadata: Mongo::Server::Monitor::AppMetadata.new(options),
+          app_metadata: metadata,
+          push_monitor_app_metadata: metadata,
         }.update(options))
     ).tap do |monitor|
       monitor.scan!

data/spec/mongo/server/monitor_spec.rb

@@ -17,6 +17,12 @@ describe Mongo::Server::Monitor do
     {}
   end
 
+  let(:monitor_app_metadata) do
+    Mongo::Server::Monitor::AppMetadata.new(
+      server_api: SpecConfig.instance.ruby_options[:server_api],
+    )
+  end
+
   let(:cluster) do
     double('cluster').tap do |cluster|
       allow(cluster).to receive(:run_sdam_flow)
@@ -32,7 +38,9 @@ describe Mongo::Server::Monitor do
   let(:monitor) do
     register_background_thread_object(
       described_class.new(server, listeners, Mongo::Monitoring.new,
-        SpecConfig.instance.test_options.merge(cluster: cluster).merge(monitor_options))
+        SpecConfig.instance.test_options.merge(cluster: cluster).merge(monitor_options).update(
+          app_metadata: monitor_app_metadata,
+          push_monitor_app_metadata: monitor_app_metadata))
     )
   end
 

data/spec/mongo/server_selector_spec.rb

@@ -196,7 +196,7 @@ describe Mongo::ServerSelector do
   end
 
   describe "#select_server" do
-    skip_if_linting
+    require_no_linting
 
     context 'when #select_in_replica_set returns a list of nils' do
 
@@ -498,7 +498,7 @@ describe Mongo::ServerSelector do
   end
 
   describe '#filter_stale_servers' do
-    skip_if_linting
+    require_no_linting
 
     include_context 'server selector'
     let(:name) do

data/spec/mongo/server_spec.rb

@@ -40,12 +40,20 @@ describe Mongo::Server do
     )
   end
 
+  let(:monitor_app_metadata) do
+    Mongo::Server::Monitor::AppMetadata.new(
+      server_api: SpecConfig.instance.ruby_options[:server_api],
+    )
+  end
+
   shared_context 'with monitoring io' do
     let(:server_options) do
       {monitoring_io: true}
     end
 
     before do
+      allow(cluster).to receive(:monitor_app_metadata).and_return(monitor_app_metadata)
+      allow(cluster).to receive(:push_monitor_app_metadata).and_return(monitor_app_metadata)
       allow(cluster).to receive(:heartbeat_interval).and_return(1000)
     end
   end
@@ -144,8 +152,13 @@ describe Mongo::Server do
       expect(server.options[:monitoring_io]).to be true
     end
 
-    it 'creates monitor with monitoring app metadata' do
-      expect(server.monitor.options[:app_metadata]).to be_a(Mongo::Server::Monitor::AppMetadata)
+    context 'with monitoring app metadata option' do
+      require_no_required_api_version
+
+      it 'creates monitor with monitoring app metadata' do
+        server.monitor.scan!
+        expect(server.monitor.connection.options[:app_metadata]).to be monitor_app_metadata
+      end
     end
 
     context 'monitoring_io: false' do