mongo 2.13.0.beta1 → 2.14.0

data/spec/spec_tests/data/uri_options/ruby-connection-options.yml

@@ -36,6 +36,7 @@ tests:
     options:
       directConnection: false
       connect: replica_set
+      replicaSet: foo
     
   -
     description: directConnection=true and connect=sharded

data/spec/spec_tests/data/uri_options/tls-options.yml

@@ -149,7 +149,8 @@ tests:
         warning: false
         hosts: ~
         auth: ~
-        options: {}
+        # https://jira.mongodb.org/browse/DRIVERS-1368
+        options: ~
     -
         description: "tls=false and ssl=false doesn't warn"
         uri: "mongodb://example.com/?tls=false&ssl=false"
@@ -157,7 +158,8 @@ tests:
         warning: false
         hosts: ~
         auth: ~
-        options: {}
+        # https://jira.mongodb.org/browse/DRIVERS-1368
+        options: ~
     -
         description: "ssl=true and tls=true doesn't warn"
         uri: "mongodb://example.com/?ssl=true&tls=true"
@@ -165,7 +167,8 @@ tests:
         warning: false
         hosts: ~
         auth: ~
-        options: {}
+        # https://jira.mongodb.org/browse/DRIVERS-1368
+        options: ~
     -
         description: "ssl=false and tls=false doesn't warn"
         uri: "mongodb://example.com/?ssl=false&tls=false"
@@ -173,7 +176,8 @@ tests:
         warning: false
         hosts: ~
         auth: ~
-        options: {}
+        # https://jira.mongodb.org/browse/DRIVERS-1368
+        options: ~
     -
         description: "tls=false and ssl=true raises error"
         uri: "mongodb://example.com/?tls=false&ssl=true"
@@ -206,3 +210,155 @@ tests:
         hosts: ~
         auth: ~
         options: {}
+    -
+        description: "tlsDisableOCSPEndpointCheck can be set to true"
+        uri: "mongodb://example.com/?tls=true&tlsDisableOCSPEndpointCheck=true"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            tls: true
+            tlsDisableOCSPEndpointCheck: true
+    -
+        description: "tlsDisableOCSPEndpointCheck can be set to false"
+        uri: "mongodb://example.com/?tls=true&tlsDisableOCSPEndpointCheck=false"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            tls: true
+            tlsDisableOCSPEndpointCheck: false
+    # 4 permutations of [tlsInsecure=true/false, tlsDisableOCSPEndpointCheck=true/false]
+    -
+        description: "tlsInsecure and tlsDisableOCSPEndpointCheck both present (and true) raises an error"
+        uri: "mongodb://example.com/?tlsInsecure=true&tlsDisableOCSPEndpointCheck=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure=true and tlsDisableOCSPEndpointCheck=false raises an error"
+        uri: "mongodb://example.com/?tlsInsecure=true&tlsDisableOCSPEndpointCheck=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure=false and tlsDisableOCSPEndpointCheck=true raises an error"
+        uri: "mongodb://example.com/?tlsInsecure=false&tlsDisableOCSPEndpointCheck=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure and tlsDisableOCSPEndpointCheck both present (and false) raises an error"
+        uri: "mongodb://example.com/?tlsInsecure=false&tlsDisableOCSPEndpointCheck=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    # 4 permutations of [tlsDisableOCSPEndpointCheck=true/false, tlsInsecure=true/false]
+    -
+        description: "tlsDisableOCSPEndpointCheck and tlsInsecure both present (and true) raises an error"
+        uri: "mongodb://example.com/?tlsDisableOCSPEndpointCheck=true&tlsInsecure=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsDisableOCSPEndpointCheck=true and tlsInsecure=false raises an error"
+        uri: "mongodb://example.com/?tlsDisableOCSPEndpointCheck=true&tlsInsecure=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsDisableOCSPEndpointCheck=false and tlsInsecure=true raises an error"
+        uri: "mongodb://example.com/?tlsDisableOCSPEndpointCheck=false&tlsInsecure=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsDisableOCSPEndpointCheck and tlsInsecure both present (and false) raises an error"
+        uri: "mongodb://example.com/?tlsDisableOCSPEndpointCheck=false&tlsInsecure=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    # 4 permutations of [tlsAllowInvalidCertificates=true/false, tlsDisableOCSPEndpointCheck=true/false]
+    -
+        description: "tlsAllowInvalidCertificates and tlsDisableOCSPEndpointCheck both present (and true) raises an error"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=true&tlsDisableOCSPEndpointCheck=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsAllowInvalidCertificates=true and tlsDisableOCSPEndpointCheck=false raises an error"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=true&tlsDisableOCSPEndpointCheck=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsAllowInvalidCertificates=false and tlsDisableOCSPEndpointCheck=true raises an error"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=false&tlsDisableOCSPEndpointCheck=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsAllowInvalidCertificates and tlsDisableOCSPEndpointCheck both present (and false) raises an error"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=false&tlsDisableOCSPEndpointCheck=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    # 4 permutations of [tlsDisableOCSPEndpointCheck=true/false, tlsAllowInvalidCertificates=true/false]
+    -
+        description: "tlsDisableOCSPEndpointCheck and tlsAllowInvalidCertificates both present (and true) raises an error"
+        uri: "mongodb://example.com/?tlsDisableOCSPEndpointCheck=true&tlsAllowInvalidCertificates=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsDisableOCSPEndpointCheck=true and tlsAllowInvalidCertificates=false raises an error"
+        uri: "mongodb://example.com/?tlsDisableOCSPEndpointCheck=true&tlsAllowInvalidCertificates=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsDisableOCSPEndpointCheck=false and tlsAllowInvalidCertificates=true raises an error"
+        uri: "mongodb://example.com/?tlsDisableOCSPEndpointCheck=false&tlsAllowInvalidCertificates=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsDisableOCSPEndpointCheck and tlsAllowInvalidCertificates both present (and false) raises an error"
+        uri: "mongodb://example.com/?tlsDisableOCSPEndpointCheck=false&tlsAllowInvalidCertificates=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}

data/spec/spec_tests/dns_seedlist_discovery_spec.rb

@@ -60,7 +60,15 @@ describe 'DNS Seedlist Discovery' do
         end
 
         it 'creates a client with the correct options' do
-          expect(test.client).to match_options(test)
+          mapped = Mongo::URI::OptionsMapper.new.ruby_to_smc(test.client.options)
+          # Connection string spec tests do not use canonical URI option names
+          actual = Utils.downcase_keys(mapped)
+          expected = Utils.downcase_keys(test.options)
+          # SRV tests use ssl URI option instead of tls one
+          if expected.key?('ssl') && !expected.key?('tls')
+            expected['tls'] = expected.delete('ssl')
+          end
+          actual.should == expected
         end
       end
     end

data/spec/spec_tests/max_staleness_spec.rb

@@ -1,147 +1,9 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 require 'runners/server_selection'
 
-describe 'Max Staleness Spec' do
+MAX_STALENESS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/max_staleness/**/*.yml").sort
 
-  include Mongo::ServerSelection::Read
-
-  MAX_STALENESS_TESTS.each do |file|
-
-    spec = Mongo::ServerSelection::Read::Spec.new(file)
-
-    context(spec.description) do
-      # Cluster needs a topology and topology needs a cluster...
-      # This temporary cluster is used for topology construction.
-      let(:temp_cluster) do
-        double('temp cluster').tap do |cluster|
-          allow(cluster).to receive(:servers_list).and_return([])
-        end
-      end
-
-      let(:topology) do
-        options = if spec.type <= Mongo::Cluster::Topology::ReplicaSetNoPrimary
-          {replica_set_name: 'foo'}
-        else
-          {}
-        end
-        spec.type.new(options, monitoring, temp_cluster)
-      end
-
-      let(:monitoring) do
-        Mongo::Monitoring.new(monitoring: false)
-      end
-
-      let(:listeners) do
-        Mongo::Event::Listeners.new
-      end
-
-      let(:options) do
-        if spec.heartbeat_frequency
-          SpecConfig.instance.test_options.merge(heartbeat_frequency: spec.heartbeat_frequency)
-        else
-          SpecConfig.instance.test_options.dup.tap do |opts|
-            opts.delete(:heartbeat_frequency)
-          end
-        end.merge!(server_selection_timeout: 0.2, connect_timeout: 0.1)
-      end
-
-      let(:cluster) do
-        double('cluster').tap do |c|
-          allow(c).to receive(:connected?).and_return(true)
-          allow(c).to receive(:summary)
-          allow(c).to receive(:topology).and_return(topology)
-          allow(c).to receive(:single?).and_return(topology.single?)
-          allow(c).to receive(:sharded?).and_return(topology.sharded?)
-          allow(c).to receive(:replica_set?).and_return(topology.replica_set?)
-          allow(c).to receive(:unknown?).and_return(topology.unknown?)
-          allow(c).to receive(:options).and_return(options)
-          allow(c).to receive(:scan!).and_return(true)
-          allow(c).to receive(:app_metadata).and_return(app_metadata)
-          allow(c).to receive(:heartbeat_interval).and_return(
-            spec.heartbeat_frequency || Mongo::Server::Monitor::DEFAULT_HEARTBEAT_INTERVAL)
-        end
-      end
-
-      let(:candidate_servers) do
-        spec.candidate_servers.collect do |server|
-          features = double('features').tap do |feat|
-            allow(feat).to receive(:max_staleness_enabled?).and_return(server['maxWireVersion'] && server['maxWireVersion'] >= 5)
-            allow(feat).to receive(:check_driver_support!).and_return(true)
-          end
-          address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, cluster, monitoring, listeners,
-            {monitoring_io: false}.update(options)
-          ).tap do |s|
-            allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'] / 1000.0) if server['avg_rtt_ms']
-            allow(s).to receive(:tags).and_return(server['tags'])
-            allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
-            allow(s).to receive(:primary?).and_return(server['type'] == 'RSPrimary')
-            allow(s).to receive(:connectable?).and_return(true)
-            allow(s).to receive(:last_write_date).and_return(
-              Time.at(server['lastWrite']['lastWriteDate']['$numberLong'].to_f / 1000)) if server['lastWrite']
-            allow(s).to receive(:last_scan).and_return(
-              Time.at(server['lastUpdateTime'].to_f / 1000))
-            allow(s).to receive(:features).and_return(features)
-          end
-        end
-      end
-
-      let(:in_latency_window) do
-        spec.in_latency_window.collect do |server|
-          Mongo::Server.new(Mongo::Address.new(server['address']), cluster, monitoring, listeners,
-            options.merge(monitoring_io: false))
-        end
-      end
-
-      let(:server_selector_definition) do
-        { mode: spec.read_preference['mode'] }.tap do |definition|
-          definition[:tag_sets] = spec.read_preference['tag_sets']
-          definition[:max_staleness] = spec.max_staleness if spec.max_staleness
-        end
-      end
-
-      let(:server_selector) do
-        Mongo::ServerSelector.get(server_selector_definition)
-      end
-
-      before do
-        allow(cluster).to receive(:servers).and_return(candidate_servers)
-        allow(cluster).to receive(:addresses).and_return(candidate_servers.map(&:address))
-      end
-
-      context 'when the max staleness is invalid' do
-
-        it 'Raises an InvalidServerPreference exception', if: spec.invalid_max_staleness? do
-
-          expect do
-            server_selector.select_server(cluster)
-          end.to raise_exception(Mongo::Error::InvalidServerPreference)
-        end
-      end
-
-      context 'when the max staleness is valid' do
-
-        context 'when there are available servers' do
-
-          it 'Finds all suitable servers in the latency window', if: (spec.replica_set? && !spec.invalid_max_staleness? && spec.server_available?) do
-            expect(server_selector.send(:select, cluster.servers)).to match_array(in_latency_window)
-          end
-
-          it 'Finds the most suitable server in the latency window', if: (!spec.invalid_max_staleness? && spec.server_available?) do
-            expect(in_latency_window).to include(server_selector.select_server(cluster))
-          end
-        end
-
-        context 'when there are no available servers', if: (!spec.invalid_max_staleness? && !spec.server_available?) do
-
-          it 'Raises a NoServerAvailable Exception' do
-            expect do
-              server_selector.select_server(cluster)
-            end.to raise_exception(Mongo::Error::NoServerAvailable)
-          end
-        end
-      end
-    end
-  end
+describe 'Max staleness spec tests' do
+  define_server_selection_spec_tests(MAX_STALENESS_TESTS)
 end

data/spec/spec_tests/retryable_reads_spec.rb

@@ -8,7 +8,7 @@ describe 'Retryable reads spec tests' do
 
   define_crud_spec_tests(RETRYABLE_READS_TESTS) do |spec, req, test|
     let(:client) do
-      authorized_client.with({max_read_retries: 0}.update(test.client_options)).tap do |client|
+      authorized_client.use(spec.database_name).with({max_read_retries: 0}.update(test.client_options)).tap do |client|
         client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
       end
     end
@@ -28,7 +28,7 @@ describe 'Retryable reads spec tests - legacy' do
     end
 
     let(:client) do
-      authorized_client.with(client_options).tap do |client|
+      authorized_client.use(spec.database_name).with(client_options).tap do |client|
         client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
       end
     end

data/spec/spec_tests/sdam_integration_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+require 'runners/crud'
+require 'runners/transactions'
+
+SDAM_INTEGRATION_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam_integration/*.yml").sort
+
+describe 'SDAM integration tests' do
+  require_no_multi_shard
+  require_wired_tiger
+
+  define_transactions_spec_tests(SDAM_INTEGRATION_TESTS)
+end

data/spec/spec_tests/sdam_monitoring_spec.rb

@@ -2,7 +2,6 @@ require 'lite_spec_helper'
 
 require 'runners/sdam'
 require 'runners/sdam/verifier'
-require 'runners/sdam_monitoring'
 
 describe 'SDAM Monitoring' do
   include Mongo::SDAM
@@ -14,7 +13,7 @@ describe 'SDAM Monitoring' do
     context("#{spec.description} (#{file.sub(%r'.*/data/sdam_monitoring/', '')})") do
 
       before(:all) do
-        @subscriber = Mongo::SDAMMonitoring::PhasedTestSubscriber.new
+        @subscriber = PhasedEventSubscriber.new
         sdam_proc = lambda do |client|
           client.subscribe(Mongo::Monitoring::SERVER_OPENING, @subscriber)
           client.subscribe(Mongo::Monitoring::SERVER_CLOSED, @subscriber)

data/spec/spec_tests/server_selection_spec.rb

@@ -1,121 +1,9 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 require 'runners/server_selection'
 
-describe 'Server Selection' do
+SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection/**/*.yml").sort
 
-  include Mongo::ServerSelection::Read
-
-  SERVER_SELECTION_TESTS.each do |file|
-
-    spec = Mongo::ServerSelection::Read::Spec.new(file)
-
-    context(spec.description) do
-
-      let(:monitoring) do
-        Mongo::Monitoring.new(monitoring: false)
-      end
-
-      # Cluster needs a topology and topology needs a cluster...
-      # This temporary cluster is used for topology construction.
-      let(:temp_cluster) do
-        double('temp cluster').tap do |cluster|
-          allow(cluster).to receive(:servers_list).and_return([])
-        end
-      end
-
-      let(:topology) do
-        options = if spec.type <= Mongo::Cluster::Topology::ReplicaSetNoPrimary
-          {replica_set_name: 'foo'}
-        else
-          {}
-        end
-        spec.type.new(options, monitoring, temp_cluster)
-      end
-
-      let(:listeners) do
-        Mongo::Event::Listeners.new
-      end
-
-      let(:cluster) do
-        double('cluster').tap do |c|
-          allow(c).to receive(:connected?).and_return(true)
-          allow(c).to receive(:summary)
-          allow(c).to receive(:topology).and_return(topology)
-          allow(c).to receive(:single?).and_return(topology.single?)
-          allow(c).to receive(:sharded?).and_return(topology.sharded?)
-          allow(c).to receive(:replica_set?).and_return(topology.replica_set?)
-          allow(c).to receive(:unknown?).and_return(topology.unknown?)
-          allow(c).to receive(:app_metadata).and_return(app_metadata)
-          allow(c).to receive(:options).and_return({})
-          allow(c).to receive(:server_selection_semaphore).and_return(nil)
-        end
-      end
-
-      let(:candidate_servers) do
-        spec.candidate_servers.collect do |server|
-          address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, cluster, monitoring, listeners,
-            {monitoring_io: false}.update(SpecConfig.instance.test_options)
-          ).tap do |s|
-            allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'] / 1000.0)
-            allow(s).to receive(:tags).and_return(server['tags'])
-            allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
-            allow(s).to receive(:primary?).and_return(server['type'] == 'RSPrimary')
-            allow(s).to receive(:connectable?).and_return(true)
-            allow(s).to receive(:check_driver_support!).and_return(true)
-          end
-        end
-      end
-
-      let(:in_latency_window) do
-        spec.in_latency_window.collect do |server|
-          address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, cluster, monitoring, listeners,
-            {monitoring_io: false}.update(SpecConfig.instance.test_options)
-          ).tap do |s|
-            allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'] / 1000.0)
-            allow(s).to receive(:tags).and_return(server['tags'])
-            allow(s).to receive(:connectable?).and_return(true)
-            allow(s).to receive(:check_driver_support!).and_return(true)
-          end
-        end
-      end
-
-      let(:server_selector) do
-        Mongo::ServerSelector.get(:mode => spec.read_preference['mode'],
-                                  :tag_sets => spec.read_preference['tag_sets'])
-      end
-
-      before do
-        allow(cluster).to receive(:servers).and_return(candidate_servers)
-        allow(cluster).to receive(:servers_list).and_return(candidate_servers)
-        allow(cluster).to receive(:addresses).and_return(candidate_servers.map(&:address))
-        allow(cluster).to receive(:options).and_return(server_selection_timeout: 0.2)
-        allow(cluster).to receive(:scan!).and_return(true)
-        allow(cluster).to receive(:app_metadata).and_return(app_metadata)
-      end
-
-      context 'Valid read preference and matching server available', if: spec.server_available? do
-
-        it 'Finds all suitable servers in the latency window', if: spec.replica_set? do
-          expect(server_selector.send(:select, cluster.servers)).to match_array(in_latency_window)
-        end
-
-        it 'Finds the most suitable server in the latency window' do
-          expect(in_latency_window).to include(server_selector.select_server(cluster))
-        end
-      end
-
-      context 'No matching server available', if: !spec.server_available? do
-        skip_if_linting
-
-        it 'Raises exception' do
-          expect do
-            server_selector.select_server(cluster)
-          end.to raise_exception(Mongo::Error::NoServerAvailable)
-        end
-      end
-    end
-  end
+describe 'Server selection spec tests' do
+  define_server_selection_spec_tests(SERVER_SELECTION_TESTS)
 end