mongo 2.11.0 → 2.11.5

data/spec/integration/retryable_writes_spec.rb

@@ -102,22 +102,22 @@ describe 'Retryable writes integration tests' do
           end
 
           it 'does not retry writes' do
-            expect {
+            expect do
               operation
-            }.to raise_error(Mongo::Error::OperationFailure, /other error/)
+            end.to raise_error(Mongo::Error::OperationFailure, /other error/)
             expect(expectation).to eq(unsuccessful_retry_value)
           end
 
           it 'indicates server used for operation' do
-            expect {
+            expect do
               operation
-            }.to raise_error(Mongo::Error::OperationFailure, /on #{ClusterConfig.instance.primary_address_str}/)
+            end.to raise_error(Mongo::Error::OperationFailure, /on #{ClusterConfig.instance.primary_address_str}/)
           end
 
           it 'indicates first attempt' do
-            expect {
+            expect do
               operation
-            }.to raise_error(Mongo::Error::OperationFailure, /attempt 1/)
+            end.to raise_error(Mongo::Error::OperationFailure, /attempt 1/)
           end
         end
       end
@@ -144,9 +144,9 @@ describe 'Retryable writes integration tests' do
           end
 
           it 'does not retry writes and raises the original error' do
-            expect {
+            expect do
               operation
-            }.to raise_error(error)
+            end.to raise_error(error)
             expect(expectation).to eq(unsuccessful_retry_value)
           end
         end
@@ -158,9 +158,9 @@ describe 'Retryable writes integration tests' do
           end
 
           it 'does not retry writes and raises the original error' do
-            expect {
+            expect do
               operation
-            }.to raise_error(error)
+            end.to raise_error(error)
             expect(expectation).to eq(unsuccessful_retry_value)
           end
         end
@@ -172,9 +172,9 @@ describe 'Retryable writes integration tests' do
           end
 
           it 'does not retry writes and raises the original error' do
-            expect {
+            expect do
               operation
-            }.to raise_error(error)
+            end.to raise_error(error)
             expect(expectation).to eq(unsuccessful_retry_value)
           end
         end
@@ -211,22 +211,22 @@ describe 'Retryable writes integration tests' do
             end
 
             it 'raises the second error' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(second_error)
+              end.to raise_error(second_error)
               expect(expectation).to eq(unsuccessful_retry_value)
             end
 
             it 'indicates server used for operation' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(Mongo::Error, /on #{ClusterConfig.instance.primary_address_str}/)
+              end.to raise_error(Mongo::Error, /on #{ClusterConfig.instance.primary_address_str}/)
             end
 
             it 'indicates second attempt' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(Mongo::Error, /attempt 2/)
+              end.to raise_error(Mongo::Error, /attempt 2/)
             end
           end
 
@@ -237,9 +237,9 @@ describe 'Retryable writes integration tests' do
             end
 
             it 'raises the second error' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(second_error)
+              end.to raise_error(second_error)
               expect(expectation).to eq(unsuccessful_retry_value)
             end
           end
@@ -251,9 +251,9 @@ describe 'Retryable writes integration tests' do
             end
 
             it 'raises the second error' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(second_error)
+              end.to raise_error(second_error)
               expect(expectation).to eq(unsuccessful_retry_value)
             end
           end
@@ -265,9 +265,9 @@ describe 'Retryable writes integration tests' do
             end
 
             it 'does not retry writes and raises the first error' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(error)
+              end.to raise_error(error)
               expect(expectation).to eq(unsuccessful_retry_value)
             end
           end
@@ -279,28 +279,28 @@ describe 'Retryable writes integration tests' do
             end
 
             it 'raises the first error' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(error)
+              end.to raise_error(error)
               expect(expectation).to eq(unsuccessful_retry_value)
             end
 
             it 'indicates server used for operation' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(Mongo::Error, /on #{ClusterConfig.instance.primary_address_str}/)
+              end.to raise_error(Mongo::Error, /on #{ClusterConfig.instance.primary_address_str}/)
             end
 
             it 'indicates first attempt' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(Mongo::Error, /attempt 1/)
+              end.to raise_error(Mongo::Error, /attempt 1/)
             end
 
             it 'indicates retry was performed' do
-              expect {
+              expect do
                 operation
-              }.to raise_error(Mongo::Error, /later retry failed: StandardError/)
+              end.to raise_error(Mongo::Error, /later retry failed: StandardError/)
             end
           end
         end
@@ -319,9 +319,9 @@ describe 'Retryable writes integration tests' do
     end
 
     it 'does not retry writes' do
-      expect {
+      expect do
         operation
-      }.to raise_error(Mongo::Error::SocketError)
+      end.to raise_error(Mongo::Error::SocketError)
       expect(expectation).to eq(unsuccessful_retry_value)
     end
   end
@@ -341,9 +341,9 @@ describe 'Retryable writes integration tests' do
     end
 
     it 'does not retry writes' do
-      expect {
+      expect do
         operation
-      }.to raise_error(Mongo::Error::SocketError)
+      end.to raise_error(Mongo::Error::SocketError)
       expect(expectation).to eq(unsuccessful_retry_value)
     end
   end

data/spec/integration/size_limit_spec.rb~12e1e9c4f... RUBY-2242 Fix zlib compression (#2021)

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe 'BSON & command size limits' do
+  let(:max_document_size) { 16*1024*1024 }
+
+  before do
+    authorized_collection.delete_many
+  end
+
+  # This test uses a large document that is significantly smaller than the
+  # size limit. It is a basic sanity check.
+  it 'allows user-provided documents to be 15MiB' do
+    document = { key: 'a' * 15*1024*1024, _id: 'foo' }
+
+    authorized_collection.insert_one(document)
+  end
+
+  # This test uses a large document that is significantly larger than the
+  # size limit. It is a basic sanity check.
+  it 'fails single write of oversized documents' do
+    document = { key: 'a' * 17*1024*1024, _id: 'foo' }
+
+    lambda do
+      authorized_collection.insert_one(document)
+    end.should raise_error(Mongo::Error::MaxBSONSize, /The document exceeds maximum allowed BSON object size after serialization/)
+  end
+
+  # This test checks our bulk write splitting when documents are not close
+  # to the limit, but where splitting is definitely required.
+  it 'allows split bulk write of medium sized documents' do
+    # 8 documents of 4 MiB each = 32 MiB total data, should be split over
+    # either 2 or 3 bulk writes depending on how well the driver splits
+    documents = []
+    1.upto(8) do |index|
+      documents << { key: 'a' * 4*1024*1024, _id: "in#{index}" }
+    end
+
+    authorized_collection.insert_many(documents)
+    authorized_collection.count_documents({}).should == 8
+  end
+
+  # This test ensures that document which are too big definitely fail insertion.
+  it 'fails bulk write of oversized documents' do
+    documents = []
+    1.upto(3) do |index|
+      documents << { key: 'a' * 17*1024*1024, _id: "in#{index}" }
+    end
+
+    lambda do
+      authorized_collection.insert_many(documents)
+    end.should raise_error(Mongo::Error::MaxBSONSize, /The document exceeds maximum allowed BSON object size after serialization/)
+    authorized_collection.count_documents({}).should == 0
+  end
+
+  it 'allows user-provided documents to be exactly 16MiB' do
+    # The document must contain the _id field, otherwise the server will
+    # add it which will increase the size of the document as persisted by
+    # the server.
+    document = { key: 'a' * (max_document_size - 28), _id: 'foo' }
+    expect(document.to_bson.length).to eq(max_document_size)
+
+    authorized_collection.insert_one(document)
+  end
+
+  it 'fails on the server when a document larger than 16MiB is inserted' do
+    document = { key: 'a' * (max_document_size - 27), _id: 'foo' }
+    expect(document.to_bson.length).to eq(max_document_size+1)
+
+    lambda do
+      authorized_collection.insert_one(document)
+    end.should raise_error(Mongo::Error::OperationFailure, /object to insert too large/)
+  end
+
+  it 'fails in the driver when a document larger than 16MiB+16KiB is inserted' do
+    document = { key: 'a' * (max_document_size - 27 + 16*1024), _id: 'foo' }
+    expect(document.to_bson.length).to eq(max_document_size+16*1024+1)
+
+    lambda do
+      authorized_collection.insert_one(document)
+    end.should raise_error(Mongo::Error::MaxBSONSize, /The document exceeds maximum allowed BSON object size after serialization/)
+  end
+
+  it 'allows bulk writes of multiple documents of exactly 16 MiB each' do
+    if SpecConfig.instance.compressors
+      pending "RUBY-2234"
+    end
+
+    documents = []
+    1.upto(3) do |index|
+      document = { key: 'a' * (max_document_size - 28), _id: "in#{index}" }
+      expect(document.to_bson.length).to eq(max_document_size)
+      documents << document
+    end
+
+    authorized_collection.insert_many(documents)
+    authorized_collection.count_documents({}).should == 3
+  end
+end

data/spec/lite_spec_helper.rb

@@ -127,6 +127,7 @@ RSpec.configure do |config|
   end
 
   config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
     c.max_formatted_output_length = 10000
   end
 end

data/spec/mongo/address_spec.rb

@@ -249,11 +249,7 @@ describe Mongo::Address do
       end
     end
 
-    context 'when creating a socket using the resolver' do
-
-      before do
-        address.send(:create_resolver, SpecConfig.instance.ssl_options)
-      end
+    context 'when creating a socket' do
 
       it 'uses the host, not the IP address' do
         expect(address.socket(0.0).host).to eq(socket_address_or_host)
@@ -285,6 +281,24 @@ describe Mongo::Address do
         end
       end
     end
+
+    describe ':connect_timeout option' do
+      clean_slate
+
+      let(:address) { Mongo::Address.new('127.0.0.1') }
+
+      it 'defaults to 10' do
+        RSpec::Mocks.with_temporary_scope do
+          resolved_address = double('address')
+          # This test's expectation
+          expect(resolved_address).to receive(:socket).with(0, {}, connect_timeout: 10)
+
+          expect(Mongo::Address::IPv4).to receive(:new).and_return(resolved_address)
+
+          address.socket(0)
+        end
+      end
+    end
   end
 
   describe '#to_s' do
@@ -320,12 +334,4 @@ describe Mongo::Address do
       end
     end
   end
-
-  describe '#connect_timeout' do
-    let(:address) { Mongo::Address.new('127.0.0.1') }
-
-    it 'defaults to 10' do
-      expect(address.send(:connect_timeout)).to eq(10)
-    end
-  end
 end

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

@@ -17,7 +17,7 @@ describe Mongo::Auth::LDAP::Conversation do
   describe '#start' do
 
     let(:query) do
-      conversation.start
+      conversation.start(nil)
     end
 
     let(:selector) do

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

@@ -7,6 +7,15 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
     described_class.new(user, mechanism)
   end
 
+  let(:connection) do
+    double('connection').tap do |connection|
+      features = double('features')
+      allow(features).to receive(:op_msg_enabled?)
+      allow(connection).to receive(:features).and_return(features)
+      allow(connection).to receive(:server)
+    end
+  end
+
   context 'when SCRAM-SHA-1 is used' do
     min_server_fcv '3.0'
 
@@ -26,9 +35,11 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
     end
 
     describe '#start' do
+      # Test uses global assertions
+      clean_slate
 
       let(:query) do
-        conversation.start
+        conversation.start(nil)
       end
 
       before do
@@ -85,7 +96,7 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
         end
 
         let(:query) do
-          conversation.continue(reply)
+          conversation.continue(reply, connection)
         end
 
         let(:selector) do
@@ -117,7 +128,7 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
 
         it 'raises an error' do
           expect {
-            conversation.continue(reply)
+            conversation.continue(reply, connection)
           }.to raise_error(Mongo::Error::InvalidNonce)
         end
       end
@@ -170,8 +181,8 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
         end
 
         let(:query) do
-          conversation.continue(continue_reply)
-          conversation.finalize(reply)
+          conversation.continue(continue_reply, connection)
+          conversation.finalize(reply, connection)
         end
 
         let(:selector) do
@@ -199,8 +210,8 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
 
         it 'raises an error' do
           expect {
-            conversation.continue(continue_reply)
-            conversation.finalize(reply)
+            conversation.continue(continue_reply, connection)
+            conversation.finalize(reply, connection)
           }.to raise_error(Mongo::Error::InvalidSignature)
         end
       end
@@ -226,7 +237,7 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
     describe '#start' do
 
       let(:query) do
-        conversation.start
+        conversation.start(nil)
       end
 
       before do
@@ -283,7 +294,7 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
         end
 
         let(:query) do
-          conversation.continue(reply)
+          conversation.continue(reply, connection)
         end
 
         let(:selector) do
@@ -315,7 +326,7 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
 
         it 'raises an error' do
           expect {
-            conversation.continue(reply)
+            conversation.continue(reply, connection)
           }.to raise_error(Mongo::Error::InvalidNonce)
         end
       end
@@ -368,8 +379,8 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
         end
 
         let(:query) do
-          conversation.continue(continue_reply)
-          conversation.finalize(reply)
+          conversation.continue(continue_reply, connection)
+          conversation.finalize(reply, connection)
         end
 
         let(:selector) do
@@ -397,8 +408,8 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
 
         it 'raises an error' do
           expect {
-            conversation.continue(continue_reply)
-            conversation.finalize(reply)
+            conversation.continue(continue_reply, connection)
+            conversation.finalize(reply, connection)
           }.to raise_error(Mongo::Error::InvalidSignature)
         end
       end