mongo 2.7.0 → 2.7.1

data/spec/mongo/socket/ssl_spec.rb

@@ -103,7 +103,8 @@ describe Mongo::Socket::SSL do
       end
     end
 
-    context 'when certificate and an encrypted key are provided as strings', if: testing_ssl_locally? do
+    context 'when certificate and an encrypted key are provided as strings' do
+      require_local_tls
 
       let(:options) do
         {
@@ -321,7 +322,8 @@ describe Mongo::Socket::SSL do
       end
     end
 
-    context 'when ruby version is < 2.4.1', if: (RUBY_VERSION < '2.4.1') do
+    context 'when ruby version is < 2.4.1' do
+      ruby_version_lt '2.4.1'
 
       context 'when a key is passed, but it is not of the right type' do
 
@@ -347,7 +349,8 @@ describe Mongo::Socket::SSL do
     # a NoMethodError because #private? is attempted to be called on the key.
     # In jruby 9.2 a TypeError is raised.
     # In jruby 9.1 a OpenSSL::PKey::PKeyError is raised.
-    context 'when ruby version is >= 2.4.1', if: (RUBY_VERSION >= '2.4.1') do
+    context 'when ruby version is >= 2.4.1' do
+      ruby_version_gte '2.4.1'
 
       context 'when a key is passed, but it is not of the right type' do
 
@@ -415,7 +418,8 @@ describe Mongo::Socket::SSL do
       end
     end
 
-    context 'when a CA certificate is provided', if: testing_ssl_locally? do
+    context 'when a CA certificate is provided' do
+      require_local_tls
 
       context 'as a path to a file' do
 
@@ -531,7 +535,8 @@ describe Mongo::Socket::SSL do
       end
     end
 
-    context 'when a CA certificate is not provided', if: testing_ssl_locally? do
+    context 'when a CA certificate is not provided' do
+      require_local_tls
 
       let(:options) do
         super().merge(
@@ -549,7 +554,8 @@ describe Mongo::Socket::SSL do
       end
     end
 
-    context 'when ssl_verify is not specified', if: testing_ssl_locally? do
+    context 'when ssl_verify is not specified' do
+      require_local_tls
 
       let(:options) do
         super().merge(
@@ -566,7 +572,8 @@ describe Mongo::Socket::SSL do
       end
     end
 
-    context 'when ssl_verify is true', if: testing_ssl_locally? do
+    context 'when ssl_verify is true' do
+      require_local_tls
 
       let(:options) do
         super().merge(

data/spec/mongo/uri/srv_protocol_spec.rb

@@ -5,6 +5,17 @@ describe Mongo::URI::SRVProtocol do
   let(:scheme) { 'mongodb+srv://' }
   let(:uri) { described_class.new(string) }
 
+  before(:all) do
+    # Since these tests assert on warnings being produced,
+    # close clients to ensure background threads do not interfere with
+    # their warnings.
+    ClientRegistry.instance.close_all_clients
+  end
+
+  let(:client) do
+    new_local_client(string, monitoring_io: false)
+  end
+
   describe 'invalid uris' do
 
     context 'when there is more than one hostname' do
@@ -346,7 +357,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:write]).to eq(concern)
+            expect(client.options[:write]).to eq(concern)
           end
         end
 
@@ -359,7 +370,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:write]).to eq(concern)
+            expect(client.options[:write]).to eq(concern)
           end
         end
 
@@ -372,7 +383,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:write]).to eq(concern)
+            expect(client.options[:write]).to eq(concern)
           end
         end
 
@@ -385,7 +396,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:write]).to eq(concern)
+            expect(client.options[:write]).to eq(concern)
           end
         end
 
@@ -399,7 +410,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:write]).to eq(concern)
+            expect(client.options[:write]).to eq(concern)
           end
         end
       end
@@ -416,7 +427,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:read]).to eq(read)
+            expect(client.options[:read]).to eq(read)
           end
         end
 
@@ -429,7 +440,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:read]).to eq(read)
+            expect(client.options[:read]).to eq(read)
           end
         end
 
@@ -442,7 +453,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:read]).to eq(read)
+            expect(client.options[:read]).to eq(read)
           end
         end
 
@@ -455,7 +466,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:read]).to eq(read)
+            expect(client.options[:read]).to eq(read)
           end
         end
 
@@ -468,7 +479,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:read]).to eq(read)
+            expect(client.options[:read]).to eq(read)
           end
         end
       end
@@ -489,7 +500,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:read]).to eq(read)
+            expect(client.options[:read]).to eq(read)
           end
         end
 
@@ -507,7 +518,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:read]).to eq(read)
+            expect(client.options[:read]).to eq(read)
           end
         end
       end
@@ -527,7 +538,7 @@ describe Mongo::URI::SRVProtocol do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(new_local_client(string).options[:read]).to eq(read)
+          expect(client.options[:read]).to eq(read)
         end
 
         context 'when the read preference and max staleness combination is invalid' do
@@ -540,7 +551,7 @@ describe Mongo::URI::SRVProtocol do
 
             it 'raises an exception when read preference is accessed on the client' do
               expect {
-                new_local_client(string).server_selector
+                client.server_selector
               }.to raise_exception(Mongo::Error::InvalidServerPreference)
             end
           end
@@ -552,7 +563,7 @@ describe Mongo::URI::SRVProtocol do
             end
 
             it 'does not raise an exception until the read preference is used' do
-              expect(new_local_client(string).read_preference).to eq(BSON::Document.new(mode: :secondary, max_staleness: 89))
+              expect(client.read_preference).to eq(BSON::Document.new(mode: :secondary, max_staleness: 89))
             end
           end
         end
@@ -567,7 +578,7 @@ describe Mongo::URI::SRVProtocol do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(new_local_client(string).options[:replica_set]).to eq(rs_name)
+          expect(client.options[:replica_set]).to eq(rs_name)
         end
       end
 
@@ -583,7 +594,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech]).to eq(expected)
+            expect(client.options[:auth_mech]).to eq(expected)
           end
 
           it 'is case-insensitive' do
@@ -600,7 +611,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech]).to eq(expected)
+            expect(client.options[:auth_mech]).to eq(expected)
           end
 
           it 'is case-insensitive' do
@@ -617,7 +628,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech]).to eq(expected)
+            expect(client.options[:auth_mech]).to eq(expected)
           end
 
           it 'is case-insensitive' do
@@ -634,7 +645,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech]).to eq(expected)
+            expect(client.options[:auth_mech]).to eq(expected)
           end
 
           it 'is case-insensitive' do
@@ -651,7 +662,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech]).to eq(expected)
+            expect(client.options[:auth_mech]).to eq(expected)
           end
 
           it 'is case-insensitive' do
@@ -679,7 +690,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_source]).to eq(source)
+            expect(client.options[:auth_source]).to eq(source)
           end
         end
 
@@ -692,7 +703,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_source]).to eq(expected)
+            expect(client.options[:auth_source]).to eq(expected)
           end
         end
       end
@@ -712,7 +723,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech_properties]).to eq(expected)
+            expect(client.options[:auth_mech_properties]).to eq(expected)
           end
         end
 
@@ -728,7 +739,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech_properties]).to eq(expected)
+            expect(client.options[:auth_mech_properties]).to eq(expected)
           end
         end
 
@@ -746,7 +757,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech_properties]).to eq(expected)
+            expect(client.options[:auth_mech_properties]).to eq(expected)
           end
         end
 
@@ -772,7 +783,7 @@ describe Mongo::URI::SRVProtocol do
           end
 
           it 'sets the options on a client created with the uri' do
-            expect(new_local_client(string).options[:auth_mech_properties]).to eq(expected)
+            expect(client.options[:auth_mech_properties]).to eq(expected)
           end
         end
       end
@@ -900,7 +911,7 @@ describe Mongo::URI::SRVProtocol do
         let(:options) { "appname=srv_test" }
 
         it 'sets the app name on the client' do
-          expect(new_local_client(string).options[:app_name]).to eq(:srv_test)
+          expect(client.options[:app_name]).to eq(:srv_test)
         end
       end
 
@@ -908,17 +919,13 @@ describe Mongo::URI::SRVProtocol do
         let(:options) { "compressors=zlib" }
 
         it 'sets the compressors as an array on the client' do
-          expect(new_local_client(string).options[:compressors]).to eq(['zlib'])
+          expect(client.options[:compressors]).to eq(['zlib'])
         end
       end
 
       context 'when a non-supported compressors option is provided' do
         let(:options) { "compressors=snoopy" }
 
-        let(:client) do
-          new_local_client(string)
-        end
-
         it 'sets no compressors on the client and warns' do
           expect(Mongo::Logger.logger).to receive(:warn)
           expect(client.options[:compressors]).to be_nil
@@ -929,7 +936,7 @@ describe Mongo::URI::SRVProtocol do
         let(:options) { "zlibCompressionLevel=6" }
 
         it 'sets the zlib compression level on the client' do
-          expect(new_local_client(string).options[:zlib_compression_level]).to eq(6)
+          expect(client.options[:zlib_compression_level]).to eq(6)
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,80 +1,3 @@
-# The tests run against a MongoDB cluster which is
-# configured and started externally to the test suite. This allows
-# running the entire test suite against, for example, a standalone
-# mongod as well as a replica set. The flip side to this is the
-# test suite will not work without a running mongo cluster, and
-# tests which are not applicable to or cannot be performed on the
-# running mongo cluster are skipped.
-#
-# Not only does the test suite require an externally launched cluster,
-# the test suite must also be told how the cluster is configured
-# via MONGODB_URI, TOPOLOGY, MONGODB_ADDRESSES, RS_ENABLED, RS_NAME and
-# SHARDED_ENABLED environment variables.
-#
-# The test suite does not validate that it is able to successfully connect
-# to the cluster prior to running the tests. If a connection fails entirely,
-# the clue is generally failures to invoke methods on nil.
-# However, it is also possible to establish a connection to a cluster which
-# is not quite correctly configured. The result is usually a mass of test
-# failures that are indistinguishable from legitimate failures.
-#
-# Additionally some of the tests assume that the seed list (given in
-# MONGODB_URI or MONGODB_ADDRESSES) encompasses all servers in the cluster,
-# and will fail when MONGODB_URI includes only one host of a replica set.
-# It is best to include all hosts of the cluster in MONGODB_URI and
-# MONGODB_ADDRESSES.
-#
-# The test suite seems to have issues connecting to a replica set
-# via IP addresses if the replica set hosts are defined with hostnames
-# (i.e., 127.0.0.1 vs localhost). Try to exactly match the contents of
-# MONGODB_URI and `rs.isMaster()` output, either by adjusting MONGODB_URI
-# or by reconfiguring the replica set.
-#
-# In order to run spec tests, the mongo cluster needs to have fail points
-# enabled. This is accomplished by starting mongod with the following option:
-#   --setParameter enableTestCommands=1
-#
-# Use the following environment variables to configure the tests:
-#
-# CLIENT_DEBUG: Show debug messages from the client.
-#   CLIENT_DEBUG=1
-#
-# MONGODB_URI: Connection string to use. This must be a valid MongoDB URI;
-# mongodb:// and mongodb+srv:// are both supported.
-# RS_ENABLED and SHARDED_ENABLED are NOT honored if using MONGODB_URI -
-# specify replica set name in the URI and to specify a sharded topology
-# set TOPOLOGY=sharded_cluster environment variable.
-#   MONGODB_URI=mongodb://127.0.0.1:27001/?replicaSet=test
-#   MONGODB_URI=mongodb://127.0.0.1:27001,127.0.0.1:27002/ TOPOLOGY=sharded_cluster
-#
-# MONGODB_ADDRESSES: Specify addresses to connect to. Use RS_ENABLED,
-# RS_NAME and SHARDED_ENABLED to configure the topology.
-#   MONGODB_ADDRESSES=127.0.0.1:27017,127.0.0.1:27018
-#   MONGODB_ADDRESSES=127.0.0.1:27017,127.0.0.1:27018 RS_ENABLED=1
-#   MONGODB_ADDRESSES=127.0.0.1:27017,127.0.0.1:27018 RS_ENABLED=1 RS_NAME=test
-#   MONGODB_ADDRESSES=127.0.0.1:27017,127.0.0.1:27018 SHARDED_ENABLED=1
-#
-# RS_ENABLED: Instruct the test suite to connect to a replica set.
-# RS_ENABLED is only honored when not using MONGODB_URI; to connect to a
-# replica set with MONGODB_URI, specify the replica set name in the URI
-# (despite the Ruby driver performing topology discovery by default, it
-# doesn't do so in the test suite).
-# RS_NAME can be given to specify the replica set name; the default is
-# ruby-driver-rs.
-#   RS_ENABLED=1
-#   RS_ENABLED=1 RS_NAME=test
-#
-# SHARDED_ENABLED: Instruct the test suite to connect to the sharded cluster.
-# Set MONGODB_URI appropriately as well.
-#   SHARDED_ENABLED=1
-#
-# SSL_ENABLED: Instruct the test suite to connect to the cluster via SSL.
-#   SSL_ENABLED=1
-#   # Also acceptable:
-#   SSL=ssl
-#
-# Note: SSL can also be enabled by giving ssl=true in the MONGODB_URI options.
-
 require 'lite_spec_helper'
 
 # Replica set name can be overridden via replicaSet parameter in MONGODB_URI
@@ -93,29 +16,13 @@ RSpec.configure do |config|
   config.include(Authorization)
   config.extend(Constraints)
 
-  config.after(:each) do
-    if rand < 0.01
-      close_local_clients
+  config.before(:all) do
+    if ClusterConfig.instance.fcv_ish >= '3.6'
+      kill_all_server_sessions
     end
   end
 end
 
-# Determine whether the test clients are connecting to a standalone.
-#
-# @since 2.0.0
-def standalone?
-  $mongo_client ||= initialize_scanned_client!
-  $standalone ||= $mongo_client.cluster.servers.first.standalone?
-end
-
-# Determine whether the test clients are connecting to a replica set.
-#
-# @since 2.0.0
-def replica_set?
-  $mongo_client ||= initialize_scanned_client!
-  $replica_set ||= $mongo_client.cluster.replica_set?
-end
-
 # Determine whether the test clients are connecting to a sharded cluster
 # or a single mongos.
 #
@@ -145,41 +52,6 @@ def single_mongos?
   ClusterConfig.instance.single_server? && ClusterConfig.instance.mongos?
 end
 
-# For instances where behavior is different on different versions, we need to
-# determine in the specs if we are 3.6 or higher.
-#
-# @since 2.5.0
-def op_msg_enabled?
-  $op_msg_enabled ||= scanned_client_server!.features.op_msg_enabled?
-end
-alias :change_stream_enabled? :op_msg_enabled?
-alias :sessions_enabled? :op_msg_enabled?
-
-# Whether change streams can be tested. Change streams are available on server versions 3.6
-#   and higher and when connected to a replica set.
-#
-# @since 2.5.0
-def test_change_streams?
-  !BSON::Environment.jruby? && change_stream_enabled? & replica_set?
-end
-
-# For instances where behavior is different on different versions, we need to
-# determine in the specs if we are 3.6 or higher.
-#
-# @since 2.5.0
-def array_filters_enabled?
-  $array_filters_enabled ||= scanned_client_server!.features.array_filters_enabled?
-end
-
-
-# For instances where behavior is different on different versions, we need to
-# determine in the specs if we are 3.4 or higher.
-#
-# @since 2.4.0
-def collation_enabled?
-  $collation_enabled ||= scanned_client_server!.features.collation_enabled?
-end
-
 # For instances where behavior is different on different versions, we need to
 # determine in the specs if we are 3.2 or higher.
 #
@@ -188,14 +60,6 @@ def find_command_enabled?
   $find_command_enabled ||= scanned_client_server!.features.find_command_enabled?
 end
 
-# For instances where behavior is different on different versions, we need to
-# determine in the specs if we are 2.7 or higher.
-#
-# @since 2.0.0
-def list_command_enabled?
-  $list_command_enabled ||= scanned_client_server!.features.list_indexes_enabled?
-end
-
 # For instances where behavior is different on different versions, we need to
 # determine in the specs if we are 4.0 or higher.
 #
@@ -204,58 +68,6 @@ def scram_sha_256_enabled?
   $scram_sha_256_enabled ||= scanned_client_server!.features.scram_sha_256_enabled?
 end
 
-# Is the test suite running locally (not on Travis).
-#
-# @since 2.1.0
-def testing_ssl_locally?
-  SpecConfig.instance.ssl? && !(ENV['CI'])
-end
-
-# Is the test suite using compression.
-#
-# @since 2.5.0
-def compression_enabled?
-  !SpecConfig.instance.compressors.nil?
-end
-
-# Is the test suite testing compression.
-# Requires that the server supports compression and compression is used by the test client.
-#
-# @since 2.5.0
-def testing_compression?
-  compression_enabled? && op_msg_enabled?
-end
-
-alias :scram_sha_1_enabled? :list_command_enabled?
-
-# Try running a command on the admin database to see if the mongod was started with auth.
-#
-# @since 2.2.0
-def auth_enabled?
-  if auth = ENV['AUTH']
-    auth == 'auth'
-  else
-    $mongo_client ||= initialize_scanned_client!
-    begin
-      $mongo_client.use(:admin).command(getCmdLineOpts: 1).first["argv"].include?("--auth")
-    rescue => e
-      e.message =~ /(not authorized)|(unauthorized)|(no users authenticated)|(requires authentication)/
-    end
-  end
-end
-
-def need_to_skip_on_sharded_auth_40?
-  sharded? && auth_enabled? && scram_sha_256_enabled?
-end
-
-# Can the driver specify a write concern that won't be overridden? (mongos 4.0+ overrides the write
-# concern)
-#
-# @since 2.6.0
-def can_set_write_concern?
-  !sharded? || !scram_sha_256_enabled?
-end
-
 # Initializes a basic scanned client to do an ismaster check.
 #
 # @since 2.0.0