mongo 2.14.1 → 2.15.0.alpha

data/spec/integration/docs_examples_spec.rb

@@ -4,7 +4,14 @@ describe 'aggregation examples in Ruby' do
   before(:all) do
     # In sharded clusters we need to ensure the database exists before running
     # the tests in this file.
-    ClientRegistry.instance.global_client('authorized')['_placeholder'].create
+    begin
+      ClientRegistry.instance.global_client('authorized')['_placeholder'].create
+    rescue Mongo::Error::OperationFailure => e
+      # Collection already exists
+      if e.code != 48
+        raise
+      end
+    end
   end
 
   let(:client) do

data/spec/integration/fork_reconnect_spec.rb

@@ -18,7 +18,10 @@ describe 'fork reconnect' do
 
   describe 'monitoring connection' do
     let(:monitor) do
-      Mongo::Server::Monitor.new(server, [], Mongo::Monitoring.new, server.options)
+      Mongo::Server::Monitor.new(server, [], Mongo::Monitoring.new, server.options.merge(
+        app_metadata: client.cluster.monitor_app_metadata,
+        push_monitor_app_metadata: client.cluster.push_monitor_app_metadata,
+      ))
     end
 
     it 'reconnects' do

data/spec/integration/ocsp_verifier_spec.rb

@@ -42,7 +42,7 @@ describe Mongo::Socket::OcspVerifier do
           lambda do
             verifier.verify
           end.should raise_error(Mongo::Error::ServerCertificateRevoked)
-        end.should take_shorter_than 3
+        end.should take_shorter_than 7
       end
     end
 
@@ -76,7 +76,7 @@ describe Mongo::Socket::OcspVerifier do
     end
 
     let(:verifier) do
-      described_class.new('foo', cert, ca_cert, cert_store, timeout: 3)
+      described_class.new('foo', cert, ca_cert, cert_store, timeout: 7)
     end
   end
 
@@ -101,7 +101,7 @@ describe Mongo::Socket::OcspVerifier do
           # the operation complete quickly.
           lambda do
             verifier.verify
-          end.should take_shorter_than 3
+          end.should take_shorter_than 7
         end
       end
 
@@ -124,7 +124,7 @@ describe Mongo::Socket::OcspVerifier do
             it 'does not wait for the timeout' do
               lambda do
                 verifier.verify
-              end.should take_shorter_than 3
+              end.should take_shorter_than 7
             end
           end
 
@@ -152,7 +152,7 @@ describe Mongo::Socket::OcspVerifier do
             it 'does not wait for the timeout' do
               lambda do
                 verifier.verify
-              end.should take_shorter_than 3
+              end.should take_shorter_than 7
             end
           end
         end
@@ -198,7 +198,7 @@ describe Mongo::Socket::OcspVerifier do
         it 'does not wait for the timeout' do
           lambda do
             verifier.verify
-          end.should take_shorter_than 3
+          end.should take_shorter_than 7
         end
       end
 
@@ -228,7 +228,7 @@ describe Mongo::Socket::OcspVerifier do
         it 'does not wait for the timeout' do
           lambda do
             verifier.verify
-          end.should take_shorter_than 3
+          end.should take_shorter_than 7
         end
       end
     end
@@ -278,6 +278,8 @@ describe Mongo::Socket::OcspVerifier do
         ensure
           server.shutdown
         end
+
+        ::Utils.wait_for_port_free(8100, 5)
       end
 
       [400, 404, 500, 503].each do |_code|
@@ -312,6 +314,9 @@ describe Mongo::Socket::OcspVerifier do
   context 'responder URI has no path' do
     require_external_connectivity
 
+    # https://github.com/jruby/jruby-openssl/issues/210
+    fails_on_jruby
+
     include_context 'basic verifier'
 
     let(:cert_path) { File.join(File.dirname(__FILE__), '../support/certificates/atlas-ocsp.crt') }
@@ -323,6 +328,7 @@ describe Mongo::Socket::OcspVerifier do
     end
 
     before do
+      verifier.ocsp_uris.length.should > 0
       URI.parse(verifier.ocsp_uris.first).path.should == ''
     end
 

data/spec/integration/operation_failure_code_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'OperationFailure code' do
-  let(:collection_name) { 'operation_error_code_spec' }
+  let(:collection_name) { 'operation_failure_code_spec' }
   let(:collection) { authorized_client[collection_name] }
 
   before do

data/spec/integration/operation_failure_message_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe 'OperationFailure message' do
+  let(:client) { authorized_client }
+  let(:collection_name) { 'operation_failure_message_spec' }
+  let(:collection) { client[collection_name] }
+
+  context 'crud error' do
+    before do
+      collection.delete_many
+    end
+
+    context 'a command error with code and code name' do
+      context 'on modern servers that provide code name' do
+        # Sharded clusters include the code name: SERVER-55582
+        require_topology :single, :replica_set
+
+        min_server_fcv '3.4'
+
+        it 'reports code, code name and message' do
+          begin
+            client.command(bogus_command: nil)
+            fail('Should have raised')
+          rescue Mongo::Error::OperationFailure => e
+            e.code_name.should == 'CommandNotFound'
+            e.message.should =~ %r,\A\[59:CommandNotFound\]: no such (?:command|cmd): '?bogus_command'?,
+          end
+        end
+      end
+
+      context 'on legacy servers where code name is not provided' do
+        max_server_version '3.2'
+
+        it 'reports code and message' do
+          begin
+            client.command(bogus_command: nil)
+            fail('Should have raised')
+          rescue Mongo::Error::OperationFailure => e
+            e.code_name.should be nil
+            e.message.should =~ %r,\A\[59\]: no such (?:command|cmd): '?bogus_command'?,
+          end
+        end
+      end
+    end
+
+    context 'a write error with code and no code name' do
+      # Sharded clusters include the code name: SERVER-55582
+      require_topology :single, :replica_set
+
+      it 'reports code name, code and message' do
+        begin
+          collection.insert_one(_id: 1)
+          collection.insert_one(_id: 1)
+          fail('Should have raised')
+        rescue Mongo::Error::OperationFailure => e
+          e.code_name.should be nil
+          e.message.should =~ %r,\A\[11000\]: (?:insertDocument :: caused by :: 11000 )?E11000 duplicate key error (?:collection|index):,
+        end
+      end
+    end
+  end
+
+  context 'authentication error' do
+    require_no_external_user
+
+    let(:client) do
+      authorized_client.with(user: 'bogus', password: 'bogus')
+    end
+
+    context 'on modern servers where code name is provided' do
+      min_server_fcv '3.4'
+
+      it 'includes code and code name in the message' do
+        lambda do
+          client.command(ping: 1)
+        end.should raise_error(Mongo::Auth::Unauthorized, /User bogus.*is not authorized.*\[18:AuthenticationFailed\]: Authentication failed/)
+      end
+    end
+
+    context 'on legacy servers where code name is not provided' do
+      max_server_version '3.2'
+
+      it 'includes code only in the message' do
+        lambda do
+          client.command(ping: 1)
+        end.should raise_error(Mongo::Auth::Unauthorized, /User bogus.*is not authorized.*\[18\]: (?:Authentication|auth) failed/)
+      end
+    end
+  end
+end

data/spec/integration/query_cache_spec.rb

@@ -1042,49 +1042,4 @@ describe 'QueryCache' do
       expect(events.length).to eq(2)
     end
   end
-
-  context 'when result set has multiple documents and cursor is iterated partially' do
-
-    before do
-      Mongo::QueryCache.enabled = false
-      5.times do
-        authorized_collection.insert_one({ name: 'testing' })
-      end
-    end
-
-    shared_examples 'retrieves full result set on second iteration' do
-      it 'retrieves full result set on second iteration' do
-        Mongo::QueryCache.clear
-        Mongo::QueryCache.enabled = true
-
-        partial_first_iteration
-
-        authorized_collection.find.to_a.length.should == 5
-      end
-
-    end
-
-    context 'using each & break' do
-      let(:partial_first_iteration) do
-        called = false
-        authorized_collection.find.each do
-          called = true
-          break
-        end
-        called.should be true
-      end
-
-      include_examples 'retrieves full result set on second iteration'
-    end
-
-    context 'using next' do
-      let(:partial_first_iteration) do
-        # #next is executed in its own fiber, and query cache is disabled
-        # for that operation.
-        authorized_collection.find.to_enum.next
-      end
-
-      include_examples 'retrieves full result set on second iteration'
-    end
-  end
 end

data/spec/integration/reconnect_spec.rb

@@ -65,7 +65,7 @@ describe 'Client after reconnect' do
     end
 
     let(:client) do
-      new_local_client(uri, SpecConfig.instance.ssl_options.merge(
+      new_local_client(uri, SpecConfig.instance.monitoring_options.merge(
         server_selection_timeout: 3.86, logger: logger))
     end
 

data/spec/integration/snappy_compression_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'Snappy compression' do
+  require_snappy_compression
+
+  before do
+    authorized_client['test'].drop
+  end
+
+  context 'when client has snappy compressor option enabled' do
+    it 'compresses the message to the server' do
+      # Double check that the client has snappy compression enabled
+      expect(authorized_client.options[:compressors]).to include('snappy')
+
+      expect(Mongo::Protocol::Compressed).to receive(:new).twice.and_call_original
+      expect(Snappy).to receive(:deflate).twice.and_call_original
+      expect(Snappy).to receive(:inflate).twice.and_call_original
+
+      authorized_client['test'].insert_one(_id: 1, text: 'hello world')
+      document = authorized_client['test'].find(_id: 1).first
+
+      expect(document['text']).to eq('hello world')
+    end
+  end
+end

data/spec/integration/srv_monitoring_spec.rb

@@ -117,7 +117,7 @@ describe 'SRV Monitoring' do
 
     let(:client) do
       new_local_client(uri,
-        SpecConfig.instance.ssl_options.merge(
+        SpecConfig.instance.monitoring_options.merge(
           server_selection_timeout: 3.16,
           socket_timeout: 8.11,
           connect_timeout: 8.12,

data/spec/integration/transactions_examples_spec.rb

@@ -8,6 +8,12 @@ describe 'Transactions examples' do
     authorized_client.with(read_concern: {level: :majority}, write: {w: :majority})
   end
 
+  before do
+    if SpecConfig.instance.client_debug?
+      Mongo::Logger.logger.level = 0
+    end
+  end
+
   let(:hr) do
     client.use(:hr).database
   end

data/spec/integration/zlib_compression_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Zlib compression' do
-  require_compression
+  require_zlib_compression
 
   before do
     authorized_client['test'].drop

data/spec/integration/zstd_compression_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe 'Zstd compression' do
+  min_server_version '4.2'
+  require_zstd_compression
+
+  before do
+    authorized_client['test'].drop
+  end
+
+  context 'when client has snappy compressor option enabled' do
+    it 'compresses the message to the server' do
+      # Double check that the client has zstd compression enabled
+      expect(authorized_client.options[:compressors]).to include('zstd')
+
+      expect(Mongo::Protocol::Compressed).to receive(:new).twice.and_call_original
+      expect(Zstd).to receive(:compress).twice.and_call_original
+      expect(Zstd).to receive(:decompress).twice.and_call_original
+
+      authorized_client['test'].insert_one(_id: 1, text: 'hello world')
+      document = authorized_client['test'].find(_id: 1).first
+
+      expect(document['text']).to eq('hello world')
+    end
+  end
+end

data/spec/lite_spec_helper.rb

@@ -69,6 +69,10 @@ unless SpecConfig.instance.client_debug?
 end
 Encoding.default_external = Encoding::UTF_8
 
+module Mrss
+  autoload :Utils, 'mrss/utils'
+end
+
 require 'mrss/lite_constraints'
 require 'support/matchers'
 require 'support/event_subscriber'
@@ -88,6 +92,8 @@ else
   TimeoutInterrupt = Timeout
 end
 
+class ExampleTimeout < StandardError; end
+
 RSpec.configure do |config|
   config.extend(CommonShortcuts::ClassMethods)
   config.include(CommonShortcuts::InstanceMethods)
@@ -118,7 +124,7 @@ RSpec.configure do |config|
       else
         45
       end
-      TimeoutInterrupt.timeout(timeout) do
+      TimeoutInterrupt.timeout(timeout, ExampleTimeout) do
         example.run
       end
     end

data/spec/mongo/address_spec.rb

@@ -263,21 +263,25 @@ describe Mongo::Address do
         end
       end
 
-      if Socket.const_defined?(:TCP_KEEPINTVL)
-        it 'sets the socket TCP_KEEPINTVL option' do
-          expect(socket.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL).int).to be <= 10
+      context 'keep-alive options' do
+        fails_on_jruby
+
+        if Socket.const_defined?(:TCP_KEEPINTVL)
+          it 'sets the socket TCP_KEEPINTVL option' do
+            expect(socket.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL).int).to be <= 10
+          end
         end
-      end
 
-      if Socket.const_defined?(:TCP_KEEPCNT)
-        it 'sets the socket TCP_KEEPCNT option' do
-          expect(socket.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT).int).to be <= 9
+        if Socket.const_defined?(:TCP_KEEPCNT)
+          it 'sets the socket TCP_KEEPCNT option' do
+            expect(socket.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT).int).to be <= 9
+          end
         end
-      end
 
-      if Socket.const_defined?(:TCP_KEEPIDLE)
-        it 'sets the socket TCP_KEEPIDLE option' do
-          expect(socket.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE).int).to be <= 120
+        if Socket.const_defined?(:TCP_KEEPIDLE)
+          it 'sets the socket TCP_KEEPIDLE option' do
+            expect(socket.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE).int).to be <= 120
+          end
         end
       end
     end

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

@@ -4,7 +4,7 @@ describe Mongo::Auth::LDAP::Conversation do
 
   let(:user) do
     Mongo::Auth::User.new(
-      database: Mongo::Database::ADMIN,
+      database: '$external',
       user: 'user',
       password: 'pencil'
     )

data/spec/mongo/auth/ldap_spec.rb

@@ -11,7 +11,11 @@ describe Mongo::Auth::LDAP do
   end
 
   let(:user) do
-    Mongo::Auth::User.new(database: SpecConfig.instance.test_db, user: 'driver', password: 'password')
+    Mongo::Auth::User.new(
+      database: '$external',
+      user: 'driver',
+      password: 'password',
+    )
   end
 
   describe '#login' do

data/spec/mongo/auth/scram_negotiation_spec.rb

@@ -329,7 +329,7 @@ describe 'SCRAM-SHA auth mechanism negotiation' do
     end
 
     let(:client) do
-      new_local_client(uri, SpecConfig.instance.ssl_options.merge(max_pool_size: 1))
+      new_local_client(uri, SpecConfig.instance.monitoring_options.merge(max_pool_size: 1))
     end
 
     context 'when the user exists' do

data/spec/mongo/auth/scram_spec.rb

@@ -8,7 +8,7 @@ describe Mongo::Auth::Scram do
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.test_options)
+    Mongo::Server::Connection.new(server, SpecConfig.instance.monitoring_options)
   end
 
   let(:cache_mod) { Mongo::Auth::CredentialCache }

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

@@ -4,7 +4,7 @@ describe Mongo::Auth::X509::Conversation do
 
   let(:user) do
     Mongo::Auth::User.new(
-      database: Mongo::Database::ADMIN,
+      database: '$external',
       user: 'user',
     )
   end
@@ -35,7 +35,7 @@ describe Mongo::Auth::X509::Conversation do
 
       let(:user) do
         Mongo::Auth::User.new(
-          database: Mongo::Database::ADMIN
+          database: '$external',
         )
       end
 
@@ -52,7 +52,7 @@ describe Mongo::Auth::X509::Conversation do
 
       let(:user) do
         Mongo::Auth::User.new(
-          database: Mongo::Database::ADMIN,
+          database: '$external',
           user: nil
         )
       end