mongo 2.17.3 → 2.18.0.beta1

data/spec/lite_spec_helper.rb

@@ -11,8 +11,6 @@ SDAM_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam_monitorin
 SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection_rtt/*.yml").sort
 CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud/**/*.yml").sort
 CRUD2_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud_v2/**/*.yml").sort
-RETRYABLE_WRITES_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/retryable_writes/**/*.yml").sort
-RETRYABLE_READS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/retryable_reads/**/*.yml").sort
 COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/command_monitoring/**/*.yml").sort
 CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/connection_string/*.yml").sort
 URI_OPTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/uri_options/*.yml").sort
@@ -55,6 +53,8 @@ autoload :IceNine, 'ice_nine'
 autoload :Timecop, 'timecop'
 autoload :ChildProcess, 'childprocess'
 
+require 'rspec/retry'
+
 if BSON::Environment.jruby?
   require 'concurrent-ruby'
   PossiblyConcurrentArray = Concurrent::Array
@@ -81,11 +81,13 @@ require 'mrss/event_subscriber'
 require 'support/common_shortcuts'
 require 'support/client_registry'
 require 'support/client_registry_macros'
+require 'support/mongos_macros'
+require 'support/macros'
 require 'support/crypt'
 require 'support/json_ext_formatter'
 require 'support/sdam_formatter_integration'
 require 'support/background_thread_registry'
-require 'support/session_registry'
+require 'mrss/session_registry'
 require 'support/local_resource_registry'
 
 if SpecConfig.instance.mri?
@@ -95,6 +97,8 @@ else
   TimeoutInterrupt = Timeout
 end
 
+Mrss.patch_mongo_for_session_registry
+
 class ExampleTimeout < StandardError; end
 
 RSpec.configure do |config|
@@ -102,6 +106,8 @@ RSpec.configure do |config|
   config.include(CommonShortcuts::InstanceMethods)
   config.extend(Mrss::LiteConstraints)
   config.include(ClientRegistryMacros)
+  config.include(MongosMacros)
+  config.extend(Mongo::Macros)
 
   if SpecConfig.instance.ci?
     SdamFormatterIntegration.subscribe
@@ -118,14 +124,17 @@ RSpec.configure do |config|
   end
 
   if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
-    # Allow a max of 30 seconds per test.
     # Tests should take under 10 seconds ideally but it seems
     # we have some that run for more than 10 seconds in CI.
     config.around(:each) do |example|
       timeout = if %w(1 true yes).include?(ENV['STRESS']&.downcase)
         210
       else
-        45
+        if BSON::Environment.jruby?
+          90
+        else
+          45
+        end
       end
       TimeoutInterrupt.timeout(timeout, ExampleTimeout) do
         example.run

data/spec/mongo/address/ipv6_spec.rb

@@ -89,6 +89,13 @@ describe Mongo::Address::IPv6 do
 
   describe '#socket' do
 
+    # In JRuby 9.3.2.0 Socket::PF_INET6 is nil, causing IPv6 tests to fail.
+    # https://github.com/jruby/jruby/issues/7069
+    # JRuby 9.2 works correctly, this test is skipped on all JRuby versions
+    # because we intend to remove JRuby support altogether and therefore
+    # adding logic to condition on JRuby versions does not make sense.
+    fails_on_jruby
+
     let(:address) do
       '[::1]'
     end

data/spec/mongo/address_spec.rb

@@ -228,6 +228,13 @@ describe Mongo::Address do
 
     context 'when providing a DNS entry that resolves to both IPv6 and IPv4' do
 
+      # In JRuby 9.3.2.0 Socket::PF_INET6 is nil, causing IPv6 tests to fail.
+      # https://github.com/jruby/jruby/issues/7069
+      # JRuby 9.2 works correctly, this test is skipped on all JRuby versions
+      # because we intend to remove JRuby support altogether and therefore
+      # adding logic to condition on JRuby versions does not make sense.
+      fails_on_jruby
+
       let(:custom_hostname) do
         'not_localhost'
       end

data/spec/mongo/auth/scram/conversation_spec.rb

@@ -33,32 +33,32 @@ describe Mongo::Auth::Scram::Conversation do
 
   describe '#start' do
 
-    let(:query) do
-      conversation.start(nil)
+    let(:msg) do
+      conversation.start(connection)
     end
 
     before do
       expect(SecureRandom).to receive(:base64).once.and_return('NDA2NzU3MDY3MDYwMTgy')
     end
 
-    let(:selector) do
-      query.selector
+    let(:command) do
+      msg.payload['command']
     end
 
     it 'sets the sasl start flag' do
-      expect(selector[:saslStart]).to eq(1)
+      expect(command[:saslStart]).to eq(1)
     end
 
     it 'sets the auto authorize flag' do
-      expect(selector[:autoAuthorize]).to eq(1)
+      expect(command[:autoAuthorize]).to eq(1)
     end
 
     it 'sets the mechanism' do
-      expect(selector[:mechanism]).to eq('SCRAM-SHA-1')
+      expect(command[:mechanism]).to eq('SCRAM-SHA-1')
     end
 
-    it 'sets the payload' do
-      expect(selector[:payload].data).to eq('n,,n=user,r=NDA2NzU3MDY3MDYwMTgy')
+    it 'sets the command' do
+      expect(command[:payload].data).to eq('n,,n=user,r=NDA2NzU3MDY3MDYwMTgy')
     end
   end
 
@@ -77,26 +77,26 @@ describe Mongo::Auth::Scram::Conversation do
         )
       end
 
-      let(:query) do
+      let(:msg) do
         conversation.continue(continue_document, connection)
       end
 
-      let(:selector) do
-        query.selector
+      let(:command) do
+        msg.payload['command']
       end
 
       it 'sets the conversation id' do
-        expect(selector[:conversationId]).to eq(1)
+        expect(command[:conversationId]).to eq(1)
       end
 
-      it 'sets the payload' do
-        expect(selector[:payload].data).to eq(
+      it 'sets the command' do
+        expect(command[:payload].data).to eq(
           'c=biws,r=NDA2NzU3MDY3MDYwMTgyt7/+IWaw1HaZZ5NmPJUTWapLpH2Gg+d8,p=qYUYNy6SQ9Jucq9rFA9nVgXQdbM='
         )
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end
 
@@ -135,26 +135,26 @@ describe Mongo::Auth::Scram::Conversation do
         BSON::Binary.new('v=gwo9E8+uifshm7ixj441GvIfuUY=')
       end
 
-      let(:query) do
+      let(:msg) do
         conversation.continue(continue_document, connection)
         conversation.process_continue_response(finalize_document)
         conversation.finalize(connection)
       end
 
-      let(:selector) do
-        query.selector
+      let(:command) do
+        msg.payload['command']
       end
 
       it 'sets the conversation id' do
-        expect(selector[:conversationId]).to eq(1)
+        expect(command[:conversationId]).to eq(1)
       end
 
-      it 'sets the empty payload' do
-        expect(selector[:payload].data).to eq('')
+      it 'sets the empty command' do
+        expect(command[:payload].data).to eq('')
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end
 

data/spec/mongo/auth/scram256/conversation_spec.rb

@@ -31,32 +31,32 @@ describe Mongo::Auth::Scram256::Conversation do
 
   describe '#start' do
 
-    let(:query) do
-      conversation.start(nil)
+    let(:msg) do
+      conversation.start(connection)
     end
 
     before do
       expect(SecureRandom).to receive(:base64).once.and_return('rOprNGfwEbeRWgbNEkqO')
     end
 
-    let(:selector) do
-      query.selector
+    let(:command) do
+      msg.payload['command']
     end
 
     it 'sets the sasl start flag' do
-      expect(selector[:saslStart]).to eq(1)
+      expect(command[:saslStart]).to eq(1)
     end
 
     it 'sets the auto authorize flag' do
-      expect(selector[:autoAuthorize]).to eq(1)
+      expect(command[:autoAuthorize]).to eq(1)
     end
 
     it 'sets the mechanism' do
-      expect(selector[:mechanism]).to eq('SCRAM-SHA-256')
+      expect(command[:mechanism]).to eq('SCRAM-SHA-256')
     end
 
     it 'sets the payload' do
-      expect(selector[:payload].data).to eq('n,,n=user,r=rOprNGfwEbeRWgbNEkqO')
+      expect(command[:payload].data).to eq('n,,n=user,r=rOprNGfwEbeRWgbNEkqO')
     end
   end
 
@@ -75,26 +75,26 @@ describe Mongo::Auth::Scram256::Conversation do
         )
       end
 
-      let(:query) do
+      let(:msg) do
         conversation.continue(continue_document, connection)
       end
 
-      let(:selector) do
-        query.selector
+      let(:command) do
+        msg.payload['command']
       end
 
       it 'sets the conversation id' do
-        expect(selector[:conversationId]).to eq(1)
+        expect(command[:conversationId]).to eq(1)
       end
 
       it 'sets the payload' do
-        expect(selector[:payload].data).to eq(
+        expect(command[:payload].data).to eq(
           'c=biws,r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF$k0,p=dHzbZapWIk4jUhN+Ute9ytag9zjfMHgsqmmiz7AndVQ='
         )
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end
 
@@ -133,26 +133,26 @@ describe Mongo::Auth::Scram256::Conversation do
         BSON::Binary.new(' v=6rriTRBi23WpRR/wtup+mMhUZUn/dB5nLTJRsjl95G4=')
       end
 
-      let(:query) do
+      let(:msg) do
         conversation.continue(continue_document, connection)
         conversation.process_continue_response(finalize_document)
         conversation.finalize(connection)
       end
 
-      let(:selector) do
-        query.selector
+      let(:command) do
+        msg.payload['command']
       end
 
       it 'sets the conversation id' do
-        expect(selector[:conversationId]).to eq(1)
+        expect(command[:conversationId]).to eq(1)
       end
 
       it 'sets the empty payload' do
-        expect(selector[:payload].data).to eq('')
+        expect(command[:payload].data).to eq('')
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end
 

data/spec/mongo/auth/scram_negotiation_spec.rb

@@ -9,6 +9,7 @@ require 'spec_helper'
 describe 'SCRAM-SHA auth mechanism negotiation' do
   min_server_fcv '4.0'
   require_no_external_user
+  require_topology :single, :replica_set, :sharded
   # Test uses global assertions
   clean_slate
 

data/spec/mongo/bulk_write/result_spec.rb

@@ -8,7 +8,7 @@ describe Mongo::BulkWrite::Result do
     {'n_inserted' => 2, 'n' => 3, 'inserted_ids' => [1, 2]}
   end
 
-  let(:subject) { described_class.new(results_document) }
+  let(:subject) { described_class.new(results_document, true) }
 
   describe 'construction' do
     it 'works' do
@@ -124,4 +124,18 @@ describe Mongo::BulkWrite::Result do
       end
     end
   end
+
+  describe "#acknowledged?" do
+
+    [true, false].each do |b|
+      context "when acknowledged is passed as #{b}" do
+
+        let(:result) { described_class.new(results_document, b) }
+
+        it "acknowledged? is #{b}" do
+          expect(result.acknowledged?).to be b
+        end
+      end
+    end
+  end
 end

data/spec/mongo/bulk_write_spec.rb

@@ -257,10 +257,24 @@ describe Mongo::BulkWrite do
                 )
               end
 
-              it 'raises a client-side error' do
-                expect do
-                  bulk_write.execute
-                end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+              context "on 4.4+ servers" do
+                min_server_version '4.4'
+
+                it "doesn't raises an error" do
+                  expect do
+                    bulk_write.execute
+                  end.to_not raise_error(Mongo::Error::UnsupportedOption)
+                end
+              end
+
+              context "on <=4.2 servers" do
+                max_server_version '4.2'
+
+                it 'raises a client-side error' do
+                  expect do
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                end
               end
             end
 
@@ -420,10 +434,24 @@ describe Mongo::BulkWrite do
                   )
                 end
 
-                it 'raises a client-side error' do
-                  expect do
-                    bulk_write.execute
-                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                context "on 4.2+ servers" do
+                  min_server_version '4.2'
+
+                  it "doesn't raises an error" do
+                    expect do
+                      bulk_write.execute
+                    end.to_not raise_error(Mongo::Error::UnsupportedOption)
+                  end
+                end
+
+                context "on <=4.2 servers" do
+                  max_server_version '4.0'
+
+                  it 'raises a client-side error' do
+                    expect do
+                      bulk_write.execute
+                    end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                  end
                 end
               end
             end
@@ -502,10 +530,24 @@ describe Mongo::BulkWrite do
                   )
                 end
 
-                it 'raises a client-side error' do
-                  expect do
-                    bulk_write.execute
-                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                context "on 4.2+ servers" do
+                  min_server_version '4.2'
+
+                  it "doesn't raises an error" do
+                    expect do
+                      bulk_write.execute
+                    end.to_not raise_error(Mongo::Error::UnsupportedOption)
+                  end
+                end
+
+                context "on <=4.0 servers" do
+                  max_server_version '4.0'
+
+                  it 'raises a client-side error' do
+                    expect do
+                      bulk_write.execute
+                    end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                  end
                 end
               end
             end
@@ -787,10 +829,24 @@ describe Mongo::BulkWrite do
                 )
               end
 
-              it 'raises a client-side error' do
-                expect do
-                  bulk_write.execute
-                end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+              context "on 4.4+ servers" do
+                min_server_version '4.4'
+
+                it "doesn't raises an error" do
+                  expect do
+                    bulk_write.execute
+                  end.to_not raise_error(Mongo::Error::UnsupportedOption)
+                end
+              end
+
+              context "on <=4.2 servers" do
+                max_server_version '4.2'
+
+                it 'raises a client-side error' do
+                  expect do
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                end
               end
             end
           end
@@ -1105,10 +1161,24 @@ describe Mongo::BulkWrite do
                 )
               end
 
-              it 'raises a client-side error' do
-                expect do
-                  bulk_write.execute
-                end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+              context "on 4.2+ servers" do
+                min_server_version '4.2'
+
+                it "doesn't raises an error" do
+                  expect do
+                    bulk_write.execute
+                  end.to_not raise_error(Mongo::Error::UnsupportedOption)
+                end
+              end
+
+              context "on <=4.0 servers" do
+                max_server_version '4.0'
+
+                it 'raises a client-side error' do
+                  expect do
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                end
               end
             end
           end
@@ -2390,4 +2460,42 @@ describe Mongo::BulkWrite do
       end
     end
   end
+
+  describe "#acknowledged?" do
+    let(:requests) { [ { insert_one: { x: 1 } } ] }
+    let(:options) { {} }
+    let(:bulk_write) do
+      described_class.new(
+        collection,
+        requests,
+        options
+      )
+    end
+    let(:result) { bulk_write.execute }
+
+    context "when using unacknowledged writes with one request" do
+     let(:options) { { write_concern: { w: 0 } } }
+
+      it 'acknowledged? returns false' do
+        expect(result.acknowledged?).to be false
+      end
+    end
+
+    context "when using unacknowledged writes with multiple requests" do
+     let(:options) { { write_concern: { w: 0 } } }
+     let(:requests) { [ { insert_one: { x: 1 } }, { insert_one: { x: 1 } } ] }
+
+      it 'acknowledged? returns false' do
+        expect(result.acknowledged?).to be false
+      end
+    end
+
+    context "when not using unacknowledged writes" do
+      let(:options) { { write_concern: { w: 1 } } }
+
+      it 'acknowledged? returns true' do
+        expect(result.acknowledged?).to be true
+      end
+    end
+  end
 end