mongo 2.6.1 → 2.6.2

data/spec/mongo/database_spec.rb

@@ -279,7 +279,8 @@ describe Mongo::Database do
       end
     end
 
-    context 'when a read concern is provided', if: find_command_enabled? do
+    context 'when a read concern is provided' do
+      min_server_version '3.2'
 
       context 'when the read concern is valid' do
 
@@ -291,8 +292,7 @@ describe Mongo::Database do
       end
 
       context 'when the read concern is not valid' do
-
-        it 'raises an exception', if: (find_command_enabled? && !sharded?) do
+        it 'raises an exception', if: !sharded? do
           expect {
             database.command(:ismaster => 1, readConcern: { level: 'yay' })
           }.to raise_error(Mongo::Error::OperationFailure)

data/spec/mongo/index/view_spec.rb

@@ -663,7 +663,8 @@ describe Mongo::Index::View do
       end
     end
 
-    context 'when providing an invalid partial index filter', if: find_command_enabled? do
+    context 'when providing an invalid partial index filter' do
+      min_server_version '3.2'
 
       it 'raises an exception' do
         expect {
@@ -672,7 +673,8 @@ describe Mongo::Index::View do
       end
     end
 
-    context 'when providing a valid partial index filter', if: find_command_enabled? do
+    context 'when providing a valid partial index filter' do
+      min_server_version '3.2'
 
       let(:expression) do
         {'a' => {'$lte' => 1.5}}

data/spec/mongo/server/connection_pool_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Server::ConnectionPool do
   end
 
   let(:address) do
-    Mongo::Address.new('127.0.0.1:27017')
+    Mongo::Address.new(SpecConfig.instance.addresses.first)
   end
 
   let(:monitoring) do

data/spec/mongo/socket/ssl_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Socket::SSL, if: running_ssl? do
+describe Mongo::Socket::SSL, if: SpecConfig.instance.ssl? do
 
   let(:address) do
     default_address
@@ -278,7 +278,7 @@ describe Mongo::Socket::SSL, if: running_ssl? do
       end
     end
 
-    context 'when ruby version is < 2.4.1', if: (RUBY_VERSION < '2.4.1' && running_ssl?) do
+    context 'when ruby version is < 2.4.1', if: (RUBY_VERSION < '2.4.1' && SpecConfig.instance.ssl?) do
 
       context 'when a key is passed, but it is not of the right type' do
 
@@ -302,7 +302,7 @@ describe Mongo::Socket::SSL, if: running_ssl? do
 
     # Note that as of MRI 2.4, Creating a socket with the wrong key type raises
     # a NoMethodError because #private? is attempted to be called on the key.
-    context 'when ruby version is >= 2.4.1', if: (RUBY_VERSION >= '2.4.1' && running_ssl?) do
+    context 'when ruby version is >= 2.4.1', if: (RUBY_VERSION >= '2.4.1' && SpecConfig.instance.ssl?) do
 
       context 'when a key is passed, but it is not of the right type' do
 

data/spec/mongo/socket/unix_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Socket::Unix do
 
   let(:socket) do
-    described_class.new("/tmp/mongodb-27017.sock", 5)
+    described_class.new("/tmp/mongodb-#{SpecConfig.instance.any_port}.sock", 5)
   end
 
   describe '#connect!' do

data/spec/mongo/socket_spec.rb

@@ -18,9 +18,9 @@ describe Mongo::Socket do
     it 'maps SystemCallError and preserves message' do
       expect do
         socket.send(:handle_errors) do
-          raise SystemCallError.new('Test error', Errno::ENOMEDIUM::Errno)
+          raise SystemCallError.new('Test error', Errno::ENFILE::Errno)
         end
-      end.to raise_error(Mongo::Error::SocketError, 'Errno::ENOMEDIUM: No medium found - Test error')
+      end.to raise_error(Mongo::Error::SocketError, 'Errno::ENFILE: Too many open files in system - Test error')
     end
 
     it 'maps IOError and preserves message' do

data/spec/mongo/uri/srv_protocol_spec.rb

@@ -200,7 +200,8 @@ describe Mongo::URI::SRVProtocol do
     end
   end
 
-  describe 'valid uris', if: test_connecting_externally? do
+  describe 'valid uris' do
+    require_external_connectivity
 
     describe 'invalid query results' do
 

data/spec/mongo/uri_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe Mongo::URI do
 
@@ -17,7 +17,8 @@ describe Mongo::URI do
       end
     end
 
-    context 'when the scheme is mongodb+srv://', if: test_connecting_externally? do
+    context 'when the scheme is mongodb+srv://' do
+      require_external_connectivity
 
       let(:string) do
         'mongodb+srv://test5.test.build.10gen.cc'
@@ -325,7 +326,7 @@ describe Mongo::URI do
 
   describe '#client_options' do
 
-    let(:db)          { TEST_DB }
+    let(:db)          { 'dummy_db' }
     let(:servers)     { 'localhost' }
     let(:string)      { "#{scheme}#{credentials}@#{servers}/#{db}" }
     let(:user)        { 'tyler' }
@@ -337,7 +338,7 @@ describe Mongo::URI do
     end
 
     it 'includes the database in the options' do
-      expect(options[:database]).to eq(TEST_DB)
+      expect(options[:database]).to eq('dummy_db')
     end
 
     it 'includes the user in the options' do
@@ -624,7 +625,7 @@ describe Mongo::URI do
     end
 
     context 'replica set option provided' do
-      let(:rs_name) { TEST_SET }
+      let(:rs_name) { 'dummy_rs' }
       let(:options) { "replicaSet=#{rs_name}" }
 
       it 'sets the replica set option' do

data/spec/spec_helper.rb

@@ -70,8 +70,11 @@
 
 require 'lite_spec_helper'
 
-if RUBY_PLATFORM !~ /\bjava\b/
+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
@@ -160,7 +163,7 @@ end
 #
 # @since 2.0.0
 def single_seed?
-  ADDRESSES.size == 1
+  SpecConfig.instance.addresses.size == 1
 end
 
 # For instances where behaviour is different on different versions, we need to
@@ -191,14 +194,6 @@ def test_change_streams?
   !BSON::Environment.jruby? && change_stream_enabled? & replica_set?
 end
 
-# Whether transactions can be tested. Transactions are available on server versions 4.0 and higher
-#   and when connected to a replica set.
-#
-# @since 2.6.0
-def test_transactions?
-  transactions_enabled? && replica_set?
-end
-
 # For instances where behaviour is different on different versions, we need to
 # determine in the specs if we are 3.6 or higher.
 #
@@ -245,27 +240,11 @@ def scram_sha_256_enabled?
   $scram_sha_256_enabled ||= $mongo_client.cluster.servers.first.features.scram_sha_256_enabled?
 end
 
-alias :transactions_enabled? :scram_sha_256_enabled?
-
 # Is the test suite running locally (not on Travis).
 #
 # @since 2.1.0
 def testing_ssl_locally?
-  running_ssl? && !(ENV['CI'])
-end
-
-# Should tests relying on external connections be run.
-#
-# @since 2.5.1
-def test_connecting_externally?
-  !ENV['CI'] && !ENV['EXTERNAL_DISABLED']
-end
-
-# Is the test suite running on SSL.
-#
-# @since 2.0.2
-def running_ssl?
-  SSL
+  SpecConfig.instance.ssl? && !(ENV['CI'])
 end
 
 # Is the test suite using compression.
@@ -317,7 +296,7 @@ end
 #
 # @since 2.0.0
 def initialize_scanned_client!
-  Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(database: TEST_DB))
+  Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(database: TEST_DB))
 end
 
 # Converts a 'camelCase' string or symbol to a :snake_case symbol.

data/spec/spec_tests/dns_seedlist_discovery_spec.rb

@@ -1,96 +1,94 @@
 require 'spec_helper'
 
 describe 'DNS Seedlist Discovery' do
+  require_external_connectivity
 
-  if test_connecting_externally?
+  include Mongo::ConnectionString
 
-    include Mongo::ConnectionString
+  before(:all) do
 
-    before(:all) do
+    module Mongo
+      class Server
+        # The constructor keeps the same API, but does not instantiate a
+        # monitor and run it.
+        alias :original_initialize :initialize
 
-      module Mongo
-        class Server
-          # The constructor keeps the same API, but does not instantiate a
-          # monitor and run it.
-          alias :original_initialize :initialize
-
-          def initialize(address, cluster, monitoring, event_listeners, options = {})
-            @address = address
-            @cluster = cluster
-            @monitoring = monitoring
-            @options = options.freeze
-            @monitor = Monitor.new(address, event_listeners, options)
-          end
+        def initialize(address, cluster, monitoring, event_listeners, options = {})
+          @address = address
+          @cluster = cluster
+          @monitoring = monitoring
+          @options = options.freeze
+          @monitor = Monitor.new(address, event_listeners, options)
+        end
 
-          # Disconnect simply needs to return true since we have no monitor and
-          # no connection.
-          alias :original_disconnect! :disconnect!
+        # Disconnect simply needs to return true since we have no monitor and
+        # no connection.
+        alias :original_disconnect! :disconnect!
 
-          def disconnect!;
-            true;
-          end
+        def disconnect!;
+          true;
         end
       end
     end
+  end
 
-    after(:all) do
+  after(:all) do
 
-      module Mongo
-        class Server
-          alias :initialize :original_initialize
-          remove_method(:original_initialize)
+    module Mongo
+      class Server
+        alias :initialize :original_initialize
+        remove_method(:original_initialize)
 
-          alias :disconnect! :original_disconnect!
-          remove_method(:original_disconnect!)
-        end
+        alias :disconnect! :original_disconnect!
+        remove_method(:original_disconnect!)
       end
     end
+  end
 
-    DNS_SEEDLIST_DISCOVERY_TESTS.each do |file_name|
+  DNS_SEEDLIST_DISCOVERY_TESTS.each do |file_name|
 
-      file = File.new(file_name)
-      spec = YAML.load(ERB.new(file.read).result)
-      file.close
+    file = File.new(file_name)
+    spec = YAML.load(ERB.new(file.read).result)
+    file.close
 
-      test = Mongo::ConnectionString::Test.new(spec)
+    test = Mongo::ConnectionString::Test.new(spec)
 
-      context(File.basename(file_name)) do
+    context(File.basename(file_name)) do
 
-        context 'when the uri is invalid', if: test.raise_error? do
+      context 'when the uri is invalid', if: test.raise_error? do
 
-          let(:valid_errors) do
-            [
-              Mongo::Error::InvalidTXTRecord,
-              Mongo::Error::NoSRVRecords,
-              Mongo::Error::InvalidURI,
-              Mongo::Error::MismatchedDomain,
-            ]
-          end
+        let(:valid_errors) do
+          [
+            Mongo::Error::InvalidTXTRecord,
+            Mongo::Error::NoSRVRecords,
+            Mongo::Error::InvalidURI,
+            Mongo::Error::MismatchedDomain,
+          ]
+        end
 
-          let(:error) do
-            e = nil
-            begin; test.uri; rescue => ex; e = ex; end
-            e
-          end
+        let(:error) do
+          e = nil
+          begin; test.uri; rescue => ex; e = ex; end
+          e
+        end
 
-          it 'raises an error' do
-            expect(valid_errors).to include(error.class)
-          end
+        it 'raises an error' do
+          expect(valid_errors).to include(error.class)
         end
+      end
 
-        context 'when the uri is valid', unless: test.raise_error? do
+      context 'when the uri is valid', unless: test.raise_error? do
 
-          it 'does not raise an exception' do
-            expect(test.uri).to be_a(Mongo::URI::SRVProtocol)
-          end
+        it 'does not raise an exception' do
+          expect(test.uri).to be_a(Mongo::URI::SRVProtocol)
+        end
 
-          it 'creates a client with the correct hosts' do
-            expect(test.client).to have_hosts(test)
-          end
+        it 'creates a client with the correct hosts' do
+          expect(test.client).to have_hosts(test)
+        end
 
-          it 'creates a client with the correct options' do
-            expect(test.client).to match_options(test)
-          end
+        it 'creates a client with the correct options' do
+          expect(test.client).to match_options(test)
         end
       end
     end

data/spec/spec_tests/sdam_monitoring_spec.rb

@@ -10,14 +10,17 @@ describe 'SDAM Monitoring' do
     context("#{spec.description} (#{file.sub(%r'.*support/sdam_monitoring/', '')})") do
 
       before(:all) do
-        @client = Mongo::Client.new([], heartbeat_frequency: 100, connect_timeout: 0.1)
         @subscriber = Mongo::SDAMMonitoring::TestSubscriber.new
-        @client.subscribe(Mongo::Monitoring::SERVER_OPENING, @subscriber)
-        @client.subscribe(Mongo::Monitoring::SERVER_CLOSED, @subscriber)
-        @client.subscribe(Mongo::Monitoring::SERVER_DESCRIPTION_CHANGED, @subscriber)
-        @client.subscribe(Mongo::Monitoring::TOPOLOGY_OPENING, @subscriber)
-        @client.subscribe(Mongo::Monitoring::TOPOLOGY_CHANGED, @subscriber)
-        @client.send(:create_from_uri, spec.uri_string)
+        sdam_proc = lambda do |client|
+          client.subscribe(Mongo::Monitoring::SERVER_OPENING, @subscriber)
+          client.subscribe(Mongo::Monitoring::SERVER_CLOSED, @subscriber)
+          client.subscribe(Mongo::Monitoring::SERVER_DESCRIPTION_CHANGED, @subscriber)
+          client.subscribe(Mongo::Monitoring::TOPOLOGY_OPENING, @subscriber)
+          client.subscribe(Mongo::Monitoring::TOPOLOGY_CHANGED, @subscriber)
+        end
+        @client = Mongo::Client.new(spec.uri_string,
+          sdam_proc: sdam_proc,
+          heartbeat_frequency: 100, connect_timeout: 0.1)
       end
 
       after(:all) do

data/spec/{mongo → spec_tests}/transactions_spec.rb

@@ -9,24 +9,29 @@ describe 'Transactions' do
     context(spec.description) do
       spec.tests.each do |test|
         context(test.description) do
+          require_transaction_support
 
           before(:each) do
             test.setup_test
           end
 
+          after(:each) do
+            test.teardown_test
+          end
+
           let(:results) do
             test.run
           end
 
-          it 'returns the correct result', if: test_transactions? do
+          it 'returns the correct result' do
             expect(results[:results]).to match_operation_result(test)
           end
 
-          it 'has the correct data in the collection', if: test_transactions? && test.outcome_collection_data do
+          it 'has the correct data in the collection', if: test.outcome_collection_data do
             expect(results[:contents]).to match_collection_data(test)
           end
 
-          it 'has the correct command_started events', if: test_transactions? && test.expectations do
+          it 'has the correct command_started events', if: test.expectations do
             test.expectations.each do |expectation|
               # We convert the hashes to sorted arrays to ensure that asserting equality between
               # the expected and actual event descriptions don't fail due to the same entries being

data/spec/support/authorization.rb

@@ -22,46 +22,16 @@ TEST_DB = 'ruby-driver'.freeze
 # @since 2.0.0
 TEST_COLL = 'test'.freeze
 
-# For Evergreen
-if ENV['MONGODB_URI']
-  MONGODB_URI = Mongo::URI.new(ENV['MONGODB_URI'])
-  URI_OPTIONS = Mongo::Options::Mapper.transform_keys_to_symbols(MONGODB_URI.uri_options)
-  if URI_OPTIONS[:replica_set]
-    ADDRESSES = MONGODB_URI.servers
-    CONNECT = { connect: :replica_set, replica_set: URI_OPTIONS[:replica_set] }
-  elsif ENV['TOPOLOGY'] == 'sharded_cluster'
-    ADDRESSES = [ MONGODB_URI.servers.first ] # See SERVER-16836 for why we can only use one host:port
-    CONNECT = { connect: :sharded }
-  else
-    ADDRESSES = MONGODB_URI.servers
-    CONNECT = { connect: :direct }
-  end
-else
-  ADDRESSES = ENV['MONGODB_ADDRESSES'] ? ENV['MONGODB_ADDRESSES'].split(',').freeze : [ '127.0.0.1:27017' ].freeze
-  if ENV['RS_ENABLED']
-    CONNECT = { connect: :replica_set, replica_set: ENV['RS_NAME'] }
-  elsif ENV['SHARDED_ENABLED']
-    CONNECT = { connect: :sharded }
-  else
-    CONNECT = { connect: :direct }
-  end
-end
-
 # The write concern to use in the tests.
 #
 # @since 2.0.0
-WRITE_CONCERN = CONNECT[:connect] == :replica_set ? { w: 2 } : { w: 1 }
+WRITE_CONCERN = SpecConfig.instance.connect_replica_set? ? { w: 2 } : { w: 1 }
 
 # An invalid write concern.
 #
 # @since 2.4.2
 INVALID_WRITE_CONCERN = { w: 4 }
 
-# Whether to use SSL.
-#
-# @since 2.0.3
-SSL = (ENV['SSL'] == 'ssl') || (ENV['SSL_ENABLED'] == 'true')
-
 # What compressor to use, if any.
 #
 # @since 2.5.0
@@ -71,7 +41,7 @@ COMPRESSORS = ENV['COMPRESSORS'] ? { compressors: ENV['COMPRESSORS'].split(',')
 #
 # @since 2.1.0
 SSL_OPTIONS = {
-                  ssl: SSL,
+                  ssl: SpecConfig.instance.ssl?,
                   ssl_verify: false,
                   ssl_cert:  CLIENT_CERT_PEM,
                   ssl_key:  CLIENT_KEY_PEM
@@ -100,29 +70,14 @@ BASE_OPTIONS = {
 # Options for test suite clients.
 #
 # @since 2.0.3
-TEST_OPTIONS = BASE_OPTIONS.merge(CONNECT).merge(SSL_OPTIONS).merge(COMPRESSORS)
-
-# The root user name.
-#
-# @since 2.0.0
-ROOT_USER_NAME = (defined?(MONGODB_URI) && MONGODB_URI.credentials[:user]) || 'root-user'
-
-# The root user password.
-#
-# @since 2.0.0
-ROOT_USER_PWD = (defined?(MONGODB_URI) && MONGODB_URI.credentials[:password]) || 'password'
-
-# The root user auth source.
-#
-# @since 2.4.2
-ROOT_USER_AUTH_SOURCE = (defined?(URI_OPTIONS) && URI_OPTIONS[:auth_source]) || Mongo::Database::ADMIN
+TEST_OPTIONS = BASE_OPTIONS.merge(SpecConfig.instance.connect).merge(SSL_OPTIONS).merge(COMPRESSORS)
 
 # Gets the root system administrator user.
 #
 # @since 2.0.0
 ROOT_USER = Mongo::Auth::User.new(
-  user: ROOT_USER_NAME,
-  password: ROOT_USER_PWD,
+  user: SpecConfig.instance.user || 'root-user',
+  password: SpecConfig.instance.password || 'password',
   roles: [
     Mongo::Auth::Roles::USER_ADMIN_ANY_DATABASE,
     Mongo::Auth::Roles::DATABASE_ADMIN_ANY_DATABASE,
@@ -171,7 +126,7 @@ TEST_READ_WRITE_USER = Mongo::Auth::User.new(
 #
 # @since 2.0.0
 AUTHORIZED_CLIENT = Mongo::Client.new(
-  ADDRESSES,
+  SpecConfig.instance.addresses,
   TEST_OPTIONS.merge(
     database: TEST_DB,
     user: TEST_USER.name,
@@ -187,7 +142,7 @@ AUTHROIZED_CLIENT_WITH_RETRY_WRITES = AUTHORIZED_CLIENT.with(retry_writes: true)
 #
 # @since 2.0.0
 UNAUTHORIZED_CLIENT = Mongo::Client.new(
-  ADDRESSES,
+  SpecConfig.instance.addresses,
   TEST_OPTIONS.merge(database: TEST_DB, monitoring: false)
 )
 
@@ -196,7 +151,7 @@ UNAUTHORIZED_CLIENT = Mongo::Client.new(
 #
 # @since 2.0.0
 ADMIN_UNAUTHORIZED_CLIENT = Mongo::Client.new(
-  ADDRESSES,
+  SpecConfig.instance.addresses,
   TEST_OPTIONS.merge(database: Mongo::Database::ADMIN, monitoring: false)
 )
 
@@ -208,7 +163,7 @@ ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
   user: ROOT_USER.name,
   password: ROOT_USER.password,
   database: TEST_DB,
-  auth_source: ROOT_USER_AUTH_SOURCE,
+  auth_source: SpecConfig.instance.auth_source || Mongo::Database::ADMIN,
   monitoring: false
 )
 
@@ -216,7 +171,7 @@ ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
 #
 # @since 2.5.1
 SUBSCRIBED_CLIENT = Mongo::Client.new(
-    ADDRESSES,
+    SpecConfig.instance.addresses,
     TEST_OPTIONS.merge(
       database: TEST_DB,
       user: TEST_USER.name,