mongo 2.11.2 → 2.13.0.beta1

data/spec/mongo/server/monitor/app_metadata_spec.rb

@@ -1,16 +1,23 @@
 require 'lite_spec_helper'
+require_relative '../app_metadata_shared'
 
 describe Mongo::Server::Monitor::AppMetadata do
 
   describe '#document' do
+    let(:document) do
+      app_metadata.send(:document)
+    end
+
     context 'when user is given and auth_mech is not given' do
       let(:app_metadata) do
         described_class.new(user: 'foo')
       end
 
       it 'does not include saslSupportedMechs' do
-        expect(app_metadata.send(:document)).not_to have_key(:saslSupportedMechs)
+        expect(document).not_to have_key(:saslSupportedMechs)
       end
     end
+
+    it_behaves_like 'app metadata document'
   end
 end

data/spec/mongo/server/monitor/connection_spec.rb

@@ -33,7 +33,7 @@ describe Mongo::Server::Monitor::Connection do
           app_metadata: Mongo::Server::Monitor::AppMetadata.new(options),
         }.update(options))
     ).tap do |monitor|
-      monitor.run!
+      monitor.scan!
     end
   end
 
@@ -66,7 +66,7 @@ describe Mongo::Server::Monitor::Connection do
       end
 
       it 'uses the connect_timeout for the address' do
-        expect(connection.address.send(:connect_timeout)).to eq(3)
+        expect(connection.address.options[:connect_timeout]).to eq(3)
       end
 
       it 'uses the connect_timeout as the socket_timeout' do
@@ -81,7 +81,7 @@ describe Mongo::Server::Monitor::Connection do
       end
 
       it 'uses the connect_timeout for the address' do
-        expect(connection.address.send(:connect_timeout)).to eq(3)
+        expect(connection.address.options[:connect_timeout]).to eq(3)
       end
 
       it 'uses the connect_timeout as the socket_timeout' do
@@ -98,8 +98,8 @@ describe Mongo::Server::Monitor::Connection do
         SpecConfig.instance.test_options.merge(connect_timeout: nil, socket_timeout: 5)
       end
 
-      it 'uses the default connect_timeout for the address' do
-        expect(connection.address.send(:connect_timeout)).to eq(10)
+      it 'does not specify connect_timeout for the address' do
+        expect(connection.address.options[:connect_timeout]).to be nil
       end
 
       it 'uses the connect_timeout as the socket_timeout' do
@@ -113,8 +113,8 @@ describe Mongo::Server::Monitor::Connection do
         SpecConfig.instance.test_options.merge(connect_timeout: nil, socket_timeout: nil)
       end
 
-      it 'uses the default connect_timeout for the address' do
-        expect(connection.address.send(:connect_timeout)).to eq(10)
+      it 'does not specify connect_timeout for the address' do
+        expect(connection.address.options[:connect_timeout]).to be nil
       end
 
       it 'uses the connect_timeout as the socket_timeout' do
@@ -122,78 +122,4 @@ describe Mongo::Server::Monitor::Connection do
       end
     end
   end
-
-  describe '#ismaster' do
-    let(:options) do
-      SpecConfig.instance.test_options
-    end
-
-    let(:result) { connection.ismaster }
-
-    it 'returns a hash' do
-      expect(result).to be_a(Hash)
-    end
-
-    it 'is successful' do
-      expect(result['ok']).to eq(1.0)
-    end
-
-    context 'network error during ismaster' do
-      let(:result) do
-        connection
-
-        socket = connection.send(:socket).send(:socket)
-        expect([Socket, OpenSSL::SSL::SSLSocket]).to include(socket.class)
-
-        expect(socket).to receive(:write).and_raise(IOError)
-        expect(socket).to receive(:write).and_call_original
-
-        connection.ismaster
-      end
-
-      before do
-        # Since we set expectations on the connection, kill the
-        # background thread (but without disconnecting the connection).
-        # Note also that we need to have the connection connected in
-        # the first place, thus the scan! call here.
-        monitor.scan!
-        monitor.instance_variable_get('@thread').kill
-        monitor.instance_variable_get('@thread').join
-      end
-
-      it 'retries ismaster and is successful' do
-        expect(result).to be_a(Hash)
-        expect(result['ok']).to eq(1.0)
-      end
-
-      it 'logs the retry' do
-        expect(Mongo::Logger.logger).to receive(:warn) do |msg|
-          expect(msg).to match(/Retrying ismaster in monitor for #{connection.address}/)
-        end
-        expect(result).to be_a(Hash)
-      end
-    end
-  end
-
-  describe '#connect!' do
-    context 'network error' do
-      before do
-        address
-        monitor.instance_variable_get('@thread').kill
-        monitor.connection.disconnect!
-      end
-
-      let(:options) { SpecConfig.instance.test_options }
-
-      let(:expected_message) { "MONGODB | Failed to handshake with #{address}: Mongo::Error::SocketError: test error" }
-
-      it 'logs a warning' do
-        expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(Mongo::Error::SocketError, 'test error')
-        expect(Mongo::Logger.logger).to receive(:warn).with(expected_message).and_call_original
-        expect do
-          monitor.connection.connect!
-        end.to raise_error(Mongo::Error::SocketError, 'test error')
-      end
-    end
-  end
 end

data/spec/mongo/server/monitor_spec.rb

@@ -54,14 +54,8 @@ describe Mongo::Server::Monitor do
         {monitoring_io: false}
       end
 
-      let(:socket) do
-        monitor.connection.connect!
-        monitor.connection.__send__(:socket)
-      end
-
-      it 'retries the ismaster' do
-        expect(socket).to receive(:write).once.and_raise(Mongo::Error::SocketError)
-        expect(socket).to receive(:write).and_call_original
+      it 'runs sdam flow on unknown description' do
+        expect(monitor).to receive(:ismaster).once.and_raise(Mongo::Error::SocketError)
         expect(cluster).to receive(:run_sdam_flow)
         monitor.scan!
       end
@@ -108,15 +102,10 @@ describe Mongo::Server::Monitor do
           default_address
         end
 
-        let(:socket) do
-          monitor.connection.connect!
-          monitor.connection.__send__(:socket)
-        end
-
         before do
-          expect(socket).to receive(:write).twice.and_raise(Mongo::Error::SocketError)
           server.unknown!
           expect(server.description).to be_unknown
+          expect(monitor).to receive(:ismaster).and_raise(Mongo::Error::SocketError)
           monitor.scan!
         end
 
@@ -125,7 +114,7 @@ describe Mongo::Server::Monitor do
         end
 
         it 'disconnects the connection' do
-          expect(monitor.connection).to_not be_connected
+          expect(monitor.connection).to be nil
         end
       end
     end
@@ -234,11 +223,12 @@ describe Mongo::Server::Monitor do
       end
 
       it 'sets the value as the timeout on the connection' do
-        expect(monitor.connection.timeout).to eq(connect_timeout)
+        monitor.scan!
+        expect(monitor.connection.socket_timeout).to eq(connect_timeout)
       end
 
       it 'set the value as the timeout on the socket' do
-        monitor.connection.connect!
+        monitor.scan!
         expect(monitor.connection.send(:socket).timeout).to eq(connect_timeout)
       end
     end
@@ -251,4 +241,73 @@ describe Mongo::Server::Monitor do
       end.not_to raise_error
     end
   end
+
+  describe '#do_scan' do
+
+    let(:result) { monitor.send(:do_scan) }
+
+    it 'returns a hash' do
+      expect(result).to be_a(Hash)
+    end
+
+    it 'is successful' do
+      expect(result['ok']).to eq(1.0)
+    end
+
+    context 'network error during ismaster' do
+      let(:result) do
+        expect(monitor).to receive(:ismaster).and_raise(IOError)
+        # The retry is done on a new socket instance.
+        #expect(socket).to receive(:write).and_call_original
+
+        monitor.send(:do_scan)
+      end
+
+      it 'adds server diagnostics' do
+        expect(Mongo::Logger.logger).to receive(:warn) do |msg|
+          # The "on <address>" and "for <address>" bits are in different parts
+          # of the message.
+          expect(msg).to match(/on #{server.address}/)
+        end
+        expect(result).to be_a(Hash)
+      end
+    end
+
+    context 'network error during connection' do
+      let(:options) { SpecConfig.instance.test_options }
+
+      let(:expected_message) { "MONGODB | Failed to handshake with #{address}: Mongo::Error::SocketError: test error" }
+
+      before do
+        monitor.connection.should be nil
+      end
+
+      it 'logs a warning' do
+        # Note: the mock call below could mock do_write and raise IOError.
+        # It is correct in raising Error::SocketError if mocking write
+        # which performs exception mapping.
+        expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(Mongo::Error::SocketError, 'test error')
+
+        messages = []
+        expect(Mongo::Logger.logger).to receive(:warn).at_least(:once) do |msg|
+          messages << msg
+        end
+
+        monitor.scan!.should be_unknown
+
+        messages.any? { |msg| msg.include?(expected_message) }.should be true
+      end
+
+      it 'adds server diagnostics' do
+        # Note: the mock call below could mock do_write and raise IOError.
+        # It is correct in raising Error::SocketError if mocking write
+        # which performs exception mapping.
+        expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(Mongo::Error::SocketError, 'test error')
+
+        expect do
+          monitor.send(:ismaster)
+        end.to raise_error(Mongo::Error::SocketError, /on #{server.address}/)
+      end
+    end
+  end
 end

data/spec/mongo/server/round_trip_time_averager_spec.rb

@@ -34,9 +34,11 @@ describe Mongo::Server::RoundTripTimeAverager do
     context 'block raises' do
       it 'does not update average rtt' do
         expect(averager).not_to receive(:update_average_round_trip_time)
-        averager.measure do
-          raise "Problem"
-        end
+        lambda do
+          averager.measure do
+            raise "Problem"
+          end
+        end.should raise_error(/Problem/)
       end
     end
   end

data/spec/mongo/server_selector/nearest_spec.rb

@@ -11,6 +11,7 @@ describe Mongo::ServerSelector::Nearest do
   end
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
   it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#initialize' do

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -11,6 +11,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
   end
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
   it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#initialize' do

data/spec/mongo/server_selector/primary_spec.rb

@@ -50,6 +50,24 @@ describe Mongo::ServerSelector::Primary do
     end
   end
 
+  describe '#hedge' do
+    context 'hedge not provided' do
+      it 'returns an empty array' do
+        expect(selector.hedge).to be_nil
+      end
+    end
+
+    context 'hedge provided' do
+      let(:hedge) { { enabled: true } }
+
+      it 'raises an error' do
+        expect {
+          selector.tag_sets
+        }.to raise_error(Mongo::Error::InvalidServerPreference)
+      end
+    end
+  end
+
   describe '#to_mongos' do
 
     it 'returns nil' do

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -12,6 +12,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
   it_behaves_like 'a server selector with sensitive data in its options'
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
 
   describe '#initialize' do
 
@@ -107,10 +108,26 @@ describe Mongo::ServerSelector::SecondaryPreferred do
         expect(selector.to_mongos).to eq(expected)
       end
     end
+
+    context 'hedge provided' do
+      let(:hedge) { { enabled: true } }
+
+      it 'returns a formatted read preference' do
+        expect(selector.to_mongos).to eq({ mode: 'secondaryPreferred', hedge: { enabled: true } })
+      end
+    end
+
+    context 'hedge not provided' do
+      let(:hedge) { nil }
+
+      it 'returns nil' do
+        expect(selector.to_mongos).to be_nil
+      end
+    end
+
   end
 
   describe '#select' do
-
     context 'no candidates' do
       let(:candidates) { [] }
 

data/spec/mongo/server_selector/secondary_spec.rb

@@ -12,6 +12,7 @@ describe Mongo::ServerSelector::Secondary do
   it_behaves_like 'a server selector with sensitive data in its options'
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
 
   describe '#initialize' do
 

data/spec/mongo/server_selector_spec.rb

@@ -313,7 +313,6 @@ describe Mongo::ServerSelector do
 
       it 'uses the local_threshold of the cluster' do
         expect(topology).to receive(:compatible?).and_return(true)
-        expect(topology).to receive(:single?).and_return(false)
         expect(read_pref.select_server(cluster)).to eq(near_server)
       end
     end

data/spec/mongo/session/session_pool_spec.rb

@@ -157,8 +157,12 @@ describe Mongo::Session::SessionPool do
       pool.checkout
     end
 
+    let(:subscriber) { EventSubscriber.new }
+
     let(:client) do
-      subscribed_client
+      authorized_client.tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
     end
 
     context 'when the number of ids is not larger than 10,000' do
@@ -175,7 +179,7 @@ describe Mongo::Session::SessionPool do
 
       let(:end_sessions_command) do
         pool.end_sessions
-        EventSubscriber.started_events.find { |c| c.command_name == 'endSessions'}
+        subscriber.started_events.find { |c| c.command_name == 'endSessions'}
       end
 
       it 'sends the endSessions command with all the session ids' do
@@ -219,7 +223,7 @@ describe Mongo::Session::SessionPool do
       end
 
       let(:end_sessions_commands) do
-        EventSubscriber.started_events.select { |c| c.command_name == 'endSessions'}
+        subscriber.started_events.select { |c| c.command_name == 'endSessions'}
       end
 
       it 'sends the command more than once' do

data/spec/mongo/socket/ssl_spec.rb

@@ -3,27 +3,18 @@ require 'spec_helper'
 # this test performs direct network connections without retries.
 # In case of intermittent network issues, retry the entire failing test.
 describe Mongo::Socket::SSL, retry: 3 do
+  clean_slate_for_all
   require_tls
 
-  let(:address) do
-    default_address.tap do
-      ClientRegistry.instance.close_all_clients
-    end
-  end
-
-  let!(:resolver) do
-    address.send(:create_resolver, {})
-  end
-
-  let(:socket_timeout) do
-    1
-  end
+  let(:host_name) { 'localhost' }
 
   let(:socket) do
-    resolver.socket(socket_timeout, options)
+    described_class.new('127.0.0.1', default_address.port,
+      host_name, 1, :INET, ssl_options.merge(
+        connect_timeout: 2.4))
   end
 
-  let(:options) do
+  let(:ssl_options) do
     SpecConfig.instance.ssl_options
   end
 
@@ -51,10 +42,10 @@ describe Mongo::Socket::SSL, retry: 3 do
     OpenSSL::PKey.read(key_string)
   end
 
-  describe '#address' do
+  describe '#human_address' do
     it 'returns the address and tls indicator' do
       addr = socket.instance_variable_get(:@tcp_socket).remote_address
-      expect(socket.send(:address)).to eq("#{addr.ip_address}:#{addr.ip_port} (#{default_address}, TLS)")
+      expect(socket.send(:human_address)).to eq("#{addr.ip_address}:#{addr.ip_port} (#{default_address}, TLS)")
     end
   end
 
@@ -82,7 +73,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when a certificate and key are provided as strings' do
 
-      let(:options) do
+      let(:ssl_options) do
         {
           :ssl => true,
           :ssl_cert_string => cert_string,
@@ -99,7 +90,7 @@ describe Mongo::Socket::SSL, retry: 3 do
     context 'when certificate and an encrypted key are provided as strings' do
       require_local_tls
 
-      let(:options) do
+      let(:ssl_options) do
         {
           :ssl => true,
           :ssl_cert_string => cert_string,
@@ -116,7 +107,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when a certificate and key are provided as objects' do
 
-      let(:options) do
+      let(:ssl_options) do
         {
           :ssl => true,
           :ssl_cert_object => cert_object,
@@ -132,7 +123,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when the certificate is specified using both a file and a PEM-encoded string' do
 
-      let(:options) do
+      let(:ssl_options) do
         super().merge(
           :ssl_cert_string => 'This is a random string, not a PEM-encoded certificate'
         )
@@ -146,7 +137,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when the certificate is specified using both a file and an object' do
 
-      let(:options) do
+      let(:ssl_options) do
         super().merge(
           :ssl_cert_object => 'This is a string, not a certificate'
         )
@@ -160,7 +151,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when the certificate is specified using both a PEM-encoded string and an object' do
 
-      let(:options) do
+      let(:ssl_options) do
         {
           :ssl => true,
           :ssl_cert_string => cert_string,
@@ -178,7 +169,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when the key is specified using both a file and a PEM-encoded string' do
 
-      let(:options) do
+      let(:ssl_options) do
         super().merge(
           :ssl_key_string => 'This is a normal string, not a PEM-encoded key'
         )
@@ -192,7 +183,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when the key is specified using both a file and an object' do
 
-      let(:options) do
+      let(:ssl_options) do
         super().merge(
           :ssl_cert_object => 'This is a string, not a key'
         )
@@ -206,7 +197,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when the key is specified using both a PEM-encoded string and an object' do
 
-      let(:options) do
+      let(:ssl_options) do
         {
           :ssl => true,
           :ssl_cert => SpecConfig.instance.client_cert_path,
@@ -224,7 +215,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when a certificate is passed, but it is not of the right type' do
 
-      let(:options) do
+      let(:ssl_options) do
         cert = "This is a string, not an X.509 Certificate"
         {
           :ssl => true,
@@ -247,38 +238,27 @@ describe Mongo::Socket::SSL, retry: 3 do
       end
 
       context 'when the hostname is verified' do
-        it 'raises an error' do
-          error = nil
-          begin
-            described_class.new(
-              resolver.host,
-              resolver.port,
-              host_name,
-              30,
-              ::Socket::PF_INET,
-              options.merge(ssl_verify: false, ssl_verify_hostname: true)
-            )
-          rescue => e
-            error = e
-          end
 
-          expect(error).to be_a(Mongo::Error::SocketError)
-          expect(error.message).to eq('SSL handshake failed due to a hostname mismatch.')
+        let(:ssl_options) do
+          SpecConfig.instance.ssl_options.merge(ssl_verify: false, ssl_verify_hostname: true)
+        end
+
+        it 'raises an error' do
+          lambda do
+            socket
+          end.should raise_error(Mongo::Error::SocketError, /SSL handshake failed due to a hostname mismatch/)
         end
       end
 
       context 'when the hostname is not verified' do
-        it 'raises an error' do
-          expect {
-            described_class.new(
-              resolver.host,
-              resolver.port,
-              host_name,
-              30,
-              ::Socket::PF_INET,
-              options.merge(ssl_verify: false, ssl_verify_hostname: false)
-            )
-          }.not_to raise_error
+        let(:ssl_options) do
+          SpecConfig.instance.ssl_options.merge(ssl_verify: false, ssl_verify_hostname: false)
+        end
+
+        it 'does not raise an error' do
+          lambda do
+            socket
+          end.should_not raise_error
         end
       end
     end
@@ -288,7 +268,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
       context 'when a key is passed, but it is not of the right type' do
 
-        let(:options) do
+        let(:ssl_options) do
           key = "This is a string not a key"
           {
               :ssl => true,
@@ -315,7 +295,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
       context 'when a key is passed, but it is not of the right type' do
 
-        let(:options) do
+        let(:ssl_options) do
           key = "This is a string not a key"
           {
               :ssl => true,
@@ -347,35 +327,82 @@ describe Mongo::Socket::SSL, retry: 3 do
       end
     end
 
-    context 'when a bad certificate is provided' do
+    context 'when a bad certificate/key is provided' do
 
-      let(:options) do
-        super().merge(
-          :ssl_key => COMMAND_MONITORING_TESTS.first
-        )
+      shared_examples_for 'raises an exception' do
+        it 'raises an exception' do
+          expect do
+            socket
+          end.to raise_exception(*expected_exception)
+        end
       end
 
-      let(:expected_exception) do
-        if SpecConfig.instance.jruby?
-          # java.lang.ClassCastException: org.bouncycastle.asn1.DERApplicationSpecific cannot be cast to org.bouncycastle.asn1.ASN1Sequence
-          # https://github.com/jruby/jruby-openssl/issues/171
-          Exception
-        else
-          # mri
-          if RUBY_VERSION >= '2.4.0'
-            # OpenSSL::PKey::PKeyError: Could not parse PKey: no start line
-            OpenSSL::OpenSSLError
-          else
-            # ArgumentError: Could not parse PKey: no start line
-            ArgumentError
+      context 'mri' do
+        only_mri
+
+        context 'when a bad certificate is provided' do
+
+          let(:expected_exception) do
+            # OpenSSL::X509::CertificateError: nested asn1 error
+            [OpenSSL::OpenSSLError, /asn1 error/i]
+          end
+
+          let(:ssl_options) do
+            super().merge(
+              :ssl_cert => COMMAND_MONITORING_TESTS.first,
+              :ssl_key => nil,
+            )
+          end
+
+          it_behaves_like 'raises an exception'
+        end
+
+        context 'when a bad key is provided' do
+
+          let(:expected_exception) do
+            if RUBY_VERSION >= '2.4.0'
+              # OpenSSL::PKey::PKeyError: Could not parse PKey: no start line
+              [OpenSSL::OpenSSLError, /Could not parse PKey/]
+            else
+              # ArgumentError: Could not parse PKey: no start line
+              [ArgumentError, /Could not parse PKey/]
+            end
+          end
+
+          let(:ssl_options) do
+            super().merge(
+              :ssl_cert => nil,
+              :ssl_key => COMMAND_MONITORING_TESTS.first,
+            )
           end
+
+          it_behaves_like 'raises an exception'
         end
       end
 
-      it 'raises an exception' do
-        expect do
-          socket
-        end.to raise_exception(expected_exception)
+      context 'jruby' do
+        require_jruby
+
+        # On JRuby the key does not appear to be parsed, therefore only
+        # specifying the bad certificate produces an error.
+
+        context 'when a bad certificate is provided' do
+
+          let(:ssl_options) do
+            super().merge(
+              :ssl_cert => COMMAND_MONITORING_TESTS.first,
+              :ssl_key => nil,
+            )
+          end
+
+          let(:expected_exception) do
+            # java.lang.ClassCastException: org.bouncycastle.asn1.DERApplicationSpecific cannot be cast to org.bouncycastle.asn1.ASN1Sequence
+            # OpenSSL::X509::CertificateError: parsing issue: malformed PEM data: no header found
+            [OpenSSL::OpenSSLError, /malformed pem data/i]
+          end
+
+          it_behaves_like 'raises an exception'
+        end
       end
     end
 
@@ -384,7 +411,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
       context 'as a path to a file' do
 
-        let(:options) do
+        let(:ssl_options) do
           super().merge(
             :ssl_ca_cert => SpecConfig.instance.local_ca_cert_path,
             :ssl_verify => true
@@ -398,7 +425,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
       context 'as a string containing the PEM-encoded certificate' do
 
-        let(:options) do
+        let(:ssl_options) do
           super().merge(
             :ssl_ca_cert_string => ca_cert_string,
             :ssl_verify => true
@@ -411,7 +438,7 @@ describe Mongo::Socket::SSL, retry: 3 do
       end
 
       context 'as an array of Certificate objects' do
-        let(:options) do
+        let(:ssl_options) do
           cert = [OpenSSL::X509::Certificate.new(ca_cert_string)]
           super().merge(
             :ssl_ca_cert_object => cert,
@@ -426,7 +453,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
       context 'both as a file and a PEM-encoded parameter' do
 
-        let(:options) do
+        let(:ssl_options) do
           super().merge(
             :ssl_ca_cert => SpecConfig.instance.local_ca_cert_path,
             :ssl_ca_cert_string => 'This is a string, not a certificate',
@@ -442,7 +469,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
       context 'both as a file and as object parameter' do
 
-        let(:options) do
+        let(:ssl_options) do
           super().merge(
             :ssl_ca_cert => SpecConfig.instance.local_ca_cert_path,
             :ssl_ca_cert_object => 'This is a string, not an array of certificates',
@@ -457,7 +484,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
       context 'both as a PEM-encoded string and as object parameter' do
 
-        let(:options) do
+        let(:ssl_options) do
           cert = File.read(SpecConfig.instance.local_ca_cert_path)
           super().merge(
             :ssl_ca_cert_string => cert,
@@ -480,11 +507,11 @@ describe Mongo::Socket::SSL, retry: 3 do
       end
 
       let(:connection) do
-        Mongo::Server::Connection.new(server, options.merge(socket_timeout: 2))
+        Mongo::Server::Connection.new(server, ssl_options.merge(socket_timeout: 2))
       end
 
       context 'as a file' do
-        let(:options) do
+        let(:ssl_options) do
           SpecConfig.instance.test_options.merge(
             ssl: true,
             ssl_cert: SpecConfig.instance.client_cert_path,
@@ -511,11 +538,11 @@ describe Mongo::Socket::SSL, retry: 3 do
       end
 
       let(:connection) do
-        Mongo::Server::Connection.new(server, options.merge(socket_timeout: 2))
+        Mongo::Server::Connection.new(server, ssl_options.merge(socket_timeout: 2))
       end
 
       context 'as a file' do
-        let(:options) do
+        let(:ssl_options) do
           SpecConfig.instance.test_options.merge(
             ssl: true,
             ssl_cert: SpecConfig.instance.client_cert_path,
@@ -537,7 +564,7 @@ describe Mongo::Socket::SSL, retry: 3 do
     context 'when a CA certificate is not provided' do
       require_local_tls
 
-      let(:options) do
+      let(:ssl_options) do
         super().merge(
           :ssl_verify => true
         )
@@ -566,12 +593,12 @@ describe Mongo::Socket::SSL, retry: 3 do
       end
 
       let(:connection) do
-        Mongo::Server::Connection.new(server, options.merge(socket_timeout: 2))
+        Mongo::Server::Connection.new(server, ssl_options.merge(socket_timeout: 2))
       end
 
       context 'as a path to a file' do
         context 'standalone' do
-          let(:options) do
+          let(:ssl_options) do
             SpecConfig.instance.test_options.merge(
               ssl_cert: SpecConfig.instance.second_level_cert_path,
               ssl_key: SpecConfig.instance.second_level_key_path,
@@ -581,6 +608,13 @@ describe Mongo::Socket::SSL, retry: 3 do
           end
 
           it 'fails' do
+            # This test provides a second level client certificate to the
+            # server *without* providing the intermediate certificate.
+            # If the server performs certificate verification, it will
+            # reject the connection (seen from the driver as a SocketError)
+            # and the test will succeed. If the server does not perform
+            # certificate verification, it will accept the connection,
+            # no SocketError will be raised and the test will fail.
             connection
             expect do
               connection.connect!
@@ -593,7 +627,7 @@ describe Mongo::Socket::SSL, retry: 3 do
           # https://github.com/jruby/jruby-openssl/issues/181
           only_mri
 
-          let(:options) do
+          let(:ssl_options) do
             SpecConfig.instance.test_options.merge(
               ssl: true,
               ssl_cert: SpecConfig.instance.second_level_cert_bundle_path,
@@ -614,7 +648,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
       context 'as a string' do
         context 'standalone' do
-          let(:options) do
+          let(:ssl_options) do
             SpecConfig.instance.test_options.merge(
               ssl_cert: nil,
               ssl_cert_string: File.read(SpecConfig.instance.second_level_cert_path),
@@ -638,7 +672,7 @@ describe Mongo::Socket::SSL, retry: 3 do
           # https://github.com/jruby/jruby-openssl/issues/181
           only_mri
 
-          let(:options) do
+          let(:ssl_options) do
             SpecConfig.instance.test_options.merge(
               ssl: true,
               ssl_cert: nil,
@@ -668,11 +702,11 @@ describe Mongo::Socket::SSL, retry: 3 do
       end
 
       let(:connection) do
-        Mongo::Server::Connection.new(server, options.merge(socket_timeout: 2))
+        Mongo::Server::Connection.new(server, ssl_options.merge(socket_timeout: 2))
       end
 
-      let(:options) do
-        SpecConfig.instance.test_options.merge(
+      let(:ssl_options) do
+        SpecConfig.instance.ssl_options.merge(
           ssl: true,
           ssl_cert: SpecConfig.instance.client_pem_path,
           ssl_key: SpecConfig.instance.client_pem_path,
@@ -692,7 +726,7 @@ describe Mongo::Socket::SSL, retry: 3 do
     context 'when ssl_verify is not specified' do
       require_local_tls
 
-      let(:options) do
+      let(:ssl_options) do
         super().merge(
           :ssl_ca_cert => SpecConfig.instance.local_ca_cert_path
         ).tap { |options| options.delete(:ssl_verify) }
@@ -706,7 +740,7 @@ describe Mongo::Socket::SSL, retry: 3 do
     context 'when ssl_verify is true' do
       require_local_tls
 
-      let(:options) do
+      let(:ssl_options) do
         super().merge(
           :ssl_ca_cert => SpecConfig.instance.local_ca_cert_path,
           :ssl_verify => true
@@ -720,7 +754,7 @@ describe Mongo::Socket::SSL, retry: 3 do
 
     context 'when ssl_verify is false' do
 
-      let(:options) do
+      let(:ssl_options) do
         super().merge(
           :ssl_ca_cert => 'invalid',
           :ssl_verify => false