mongo 2.6.4 → 2.7.0.rc0

data/spec/mongo/uri_spec.rb

@@ -412,7 +412,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+          client = new_local_client_nmio(string)
+          expect(client.options[:write]).to eq(concern)
         end
       end
 
@@ -425,7 +426,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+          client = new_local_client_nmio(string)
+          expect(client.options[:write]).to eq(concern)
         end
       end
 
@@ -438,7 +440,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+          client = new_local_client_nmio(string)
+          expect(client.options[:write]).to eq(concern)
         end
       end
 
@@ -451,7 +454,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+          client = new_local_client_nmio(string)
+          expect(client.options[:write]).to eq(concern)
         end
       end
 
@@ -465,7 +469,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:write]).to eq(concern)
+          client = new_local_client_nmio(string)
+          expect(client.options[:write]).to eq(concern)
         end
       end
     end
@@ -482,7 +487,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+          client = new_local_client_nmio(string)
+          expect(client.options[:read]).to eq(read)
         end
       end
 
@@ -495,7 +501,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+          client = new_local_client_nmio(string)
+          expect(client.options[:read]).to eq(read)
         end
       end
 
@@ -508,7 +515,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+          client = new_local_client_nmio(string)
+          expect(client.options[:read]).to eq(read)
         end
       end
 
@@ -521,7 +529,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+          client = new_local_client_nmio(string)
+          expect(client.options[:read]).to eq(read)
         end
       end
 
@@ -534,7 +543,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+          client = new_local_client_nmio(string)
+          expect(client.options[:read]).to eq(read)
         end
       end
     end
@@ -555,7 +565,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+          client = new_local_client_nmio(string)
+          expect(client.options[:read]).to eq(read)
         end
       end
 
@@ -573,7 +584,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:read]).to eq(read)
+          client = new_local_client_nmio(string)
+          expect(client.options[:read]).to eq(read)
         end
       end
     end
@@ -593,7 +605,8 @@ describe Mongo::URI do
       end
 
       it 'sets the options on a client created with the uri' do
-        expect(Mongo::Client.new(string).options[:read]).to eq(read)
+          client = new_local_client_nmio(string)
+        expect(client.options[:read]).to eq(read)
       end
 
       context 'when the read preference and max staleness combination is invalid' do
@@ -605,8 +618,9 @@ describe Mongo::URI do
           end
 
           it 'raises an exception when read preference is accessed on the client' do
+            client = new_local_client_nmio(string)
             expect {
-              Mongo::Client.new(string).server_selector
+              client.server_selector
             }.to raise_exception(Mongo::Error::InvalidServerPreference)
           end
         end
@@ -618,7 +632,8 @@ describe Mongo::URI do
           end
 
           it 'does not raise an exception until the read preference is used' do
-            expect(Mongo::Client.new(string).read_preference).to eq(BSON::Document.new(mode: :secondary, max_staleness: 89))
+            client = new_local_client_nmio(string)
+            expect(client.read_preference).to eq(BSON::Document.new(mode: :secondary, max_staleness: 89))
           end
         end
       end
@@ -633,7 +648,8 @@ describe Mongo::URI do
       end
 
       it 'sets the options on a client created with the uri' do
-        expect(Mongo::Client.new(string).options[:replica_set]).to eq(rs_name)
+        client = new_local_client_nmio(string)
+        expect(client.options[:replica_set]).to eq(rs_name)
       end
     end
 
@@ -649,11 +665,13 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
 
         it 'is case-insensitive' do
-          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string.downcase)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
       end
 
@@ -666,11 +684,13 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
 
         it 'is case-insensitive' do
-          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string.downcase)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
       end
 
@@ -683,11 +703,13 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
 
         it 'is case-insensitive' do
-          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string.downcase)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
       end
 
@@ -700,11 +722,13 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
 
         it 'is case-insensitive' do
-          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string.downcase)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
       end
 
@@ -717,18 +741,21 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
 
         it 'is case-insensitive' do
-          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+          client = new_local_client_nmio(string.downcase)
+          expect(client.options[:auth_mech]).to eq(expected)
         end
 
         context 'when a username is not provided' do
 
           it 'recognizes the mechanism with no username' do
-            expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
-            expect(Mongo::Client.new(string.downcase).options[:user]).to be_nil
+            client = new_local_client_nmio(string.downcase)
+            expect(client.options[:auth_mech]).to eq(expected)
+            expect(client.options[:user]).to be_nil
           end
         end
       end
@@ -745,7 +772,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_source]).to eq(source)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_source]).to eq(source)
         end
       end
 
@@ -758,7 +786,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_source]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_source]).to eq(expected)
         end
       end
     end
@@ -778,7 +807,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech_properties]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech_properties]).to eq(expected)
         end
       end
 
@@ -794,7 +824,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech_properties]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech_properties]).to eq(expected)
         end
       end
 
@@ -812,7 +843,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech_properties]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech_properties]).to eq(expected)
         end
       end
 
@@ -838,7 +870,8 @@ describe Mongo::URI do
         end
 
         it 'sets the options on a client created with the uri' do
-          expect(Mongo::Client.new(string).options[:auth_mech_properties]).to eq(expected)
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech_properties]).to eq(expected)
         end
       end
     end
@@ -966,7 +999,8 @@ describe Mongo::URI do
       let(:options) { "appname=uri_test" }
 
       it 'sets the app name on the client' do
-        expect(Mongo::Client.new(string).options[:app_name]).to eq(:uri_test)
+        client = new_local_client_nmio(string)
+        expect(client.options[:app_name]).to eq(:uri_test)
       end
     end
 
@@ -974,7 +1008,8 @@ describe Mongo::URI do
       let(:options) { "compressors=zlib" }
 
       it 'sets the compressors as an array on the client' do
-        expect(Mongo::Client.new(string).options[:compressors]).to eq(['zlib'])
+        client = new_local_client_nmio(string)
+        expect(client.options[:compressors]).to eq(['zlib'])
       end
     end
 
@@ -982,7 +1017,7 @@ describe Mongo::URI do
       let(:options) { "compressors=snoopy" }
 
       let(:client) do
-        Mongo::Client.new(string)
+        client = new_local_client_nmio(string)
       end
 
       it 'sets no compressors on the client and warns' do
@@ -995,7 +1030,8 @@ describe Mongo::URI do
       let(:options) { "zlibCompressionLevel=6" }
 
       it 'sets the zlib compression level on the client' do
-        expect(Mongo::Client.new(string).options[:zlib_compression_level]).to eq(6)
+        client = new_local_client_nmio(string)
+        expect(client.options[:zlib_compression_level]).to eq(6)
       end
     end
   end

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@
 # 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 failpoints
+# 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
 #
@@ -67,45 +67,35 @@
 # 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'
 
-if SpecConfig.instance.mri?
-  require 'timeout_interrupt'
-else
-  require 'timeout'
-  TimeoutInterrupt = Timeout
-end
-
 # Replica set name can be overridden via replicaSet parameter in MONGODB_URI
 # environment variable or by specifying RS_NAME environment variable when
 # not using MONGODB_URI.
 TEST_SET = 'ruby-driver-rs'
 
-require 'support/travis'
 require 'support/authorization'
 require 'support/primary_socket'
 require 'support/constraints'
+require 'support/cluster_config'
 require 'rspec/retry'
+require 'support/monitoring_ext'
 
 RSpec.configure do |config|
   config.include(Authorization)
   config.extend(Constraints)
 
-  config.before(:suite) do
-    begin
-      # Create the root user administrator as the first user to be added to the
-      # database. This user will need to be authenticated in order to add any
-      # more users to any other databases.
-      ADMIN_UNAUTHORIZED_CLIENT.database.users.create(ROOT_USER)
-      ADMIN_UNAUTHORIZED_CLIENT.close
-    rescue Exception => e
-    end
-    begin
-      # Adds the test user to the test database with permissions on all
-      # databases that will be used in the test suite.
-      ADMIN_AUTHORIZED_TEST_CLIENT.database.users.create(TEST_USER)
-    rescue Exception => e
+  config.after(:each) do
+    if rand < 0.01
+      close_local_clients
     end
   end
 end
@@ -142,9 +132,7 @@ end
 #
 # @since 2.0.0
 def single_rs_member?
-  $mongo_client ||= initialize_scanned_client!
-  $single_rs_member ||= (single_seed? &&
-      $mongo_client.cluster.servers.first.replica_set_name)
+  ClusterConfig.instance.single_server? && ClusterConfig.instance.replica_set_name
 end
 
 # Determine whether the single address provided is a mongos.
@@ -154,38 +142,19 @@ end
 #
 # @since 2.0.0
 def single_mongos?
-  $mongo_client ||= initialize_scanned_client!
-  $single_mongos ||= (single_seed? &&
-      $mongo_client.cluster.servers.first.mongos?)
+  ClusterConfig.instance.single_server? && ClusterConfig.instance.mongos?
 end
 
-# Determine whether a single address was provided.
-#
-# @since 2.0.0
-def single_seed?
-  SpecConfig.instance.addresses.size == 1
-end
-
-# For instances where behaviour is different on different versions, we need to
+# 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?
-  $mongo_client ||= initialize_scanned_client!
-  $op_msg_enabled ||= $mongo_client.cluster.servers.first.features.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 sessions can be tested. Sessions are available on server versions 3.6
-#   and higher and when connected to a replica set or sharded cluster.
-#
-# @since 2.5.0
-def test_sessions?
-  sessions_enabled? && (replica_set? || sharded?)
-end
-
 # Whether change streams can be tested. Change streams are available on server versions 3.6
 #   and higher and when connected to a replica set.
 #
@@ -194,41 +163,37 @@ def test_change_streams?
   !BSON::Environment.jruby? && change_stream_enabled? & replica_set?
 end
 
-# For instances where behaviour is different on different versions, we need to
+# 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?
-  $mongo_client ||= initialize_scanned_client!
-  $array_filters_enabled ||= $mongo_client.cluster.servers.first.features.array_filters_enabled?
+  $array_filters_enabled ||= scanned_client_server!.features.array_filters_enabled?
 end
 
 
-# For instances where behaviour is different on different versions, we need to
+# 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?
-  $mongo_client ||= initialize_scanned_client!
-  $collation_enabled ||= $mongo_client.cluster.servers.first.features.collation_enabled?
+  $collation_enabled ||= scanned_client_server!.features.collation_enabled?
 end
 
-# For instances where behaviour is different on different versions, we need to
+# For instances where behavior is different on different versions, we need to
 # determine in the specs if we are 3.2 or higher.
 #
 # @since 2.0.0
 def find_command_enabled?
-  $mongo_client ||= initialize_scanned_client!
-  $find_command_enabled ||= $mongo_client.cluster.servers.first.features.find_command_enabled?
+  $find_command_enabled ||= scanned_client_server!.features.find_command_enabled?
 end
 
-# For instances where behaviour is different on different versions, we need to
+# 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?
-  $mongo_client ||= initialize_scanned_client!
-  $list_command_enabled ||= $mongo_client.cluster.servers.first.features.list_indexes_enabled?
+  $list_command_enabled ||= scanned_client_server!.features.list_indexes_enabled?
 end
 
 # For instances where behavior is different on different versions, we need to
@@ -236,8 +201,7 @@ end
 #
 # @since 2.6.0
 def scram_sha_256_enabled?
-  $mongo_client ||= initialize_scanned_client!
-  $scram_sha_256_enabled ||= $mongo_client.cluster.servers.first.features.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).
@@ -251,7 +215,7 @@ end
 #
 # @since 2.5.0
 def compression_enabled?
-  COMPRESSORS[:compressors]
+  !SpecConfig.instance.compressors.nil?
 end
 
 # Is the test suite testing compression.
@@ -296,7 +260,18 @@ end
 #
 # @since 2.0.0
 def initialize_scanned_client!
-  Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(database: TEST_DB))
+  ClientRegistry.instance.global_client('basic')
+end
+
+class ScannedClientHasNoServers < StandardError; end
+
+def scanned_client_server!
+  $mongo_client ||= initialize_scanned_client!
+  server = $mongo_client.cluster.servers.first
+  if server.nil?
+    raise ScannedClientHasNoServers
+  end
+  server
 end
 
 # Converts a 'camelCase' string or symbol to a :snake_case symbol.