mongo 2.13.0 → 2.15.0.alpha

data/spec/mongo/utils_spec.rb

@@ -0,0 +1,39 @@
+require 'lite_spec_helper'
+
+describe Mongo::Utils do
+  describe '#shallow_symbolize_keys' do
+    it 'symbolizes' do
+      described_class.shallow_symbolize_keys(
+        'foo' => 'bar',
+        'aKey' => 'aValue',
+        'a_key' => 'a_value',
+        key: :value,
+      ).should == {
+        foo: 'bar',
+        aKey: 'aValue',
+        a_key: 'a_value',
+        key: :value,
+      }
+    end
+  end
+
+  describe '#shallow_camelize_keys' do
+    it 'camelizes' do
+      described_class.shallow_camelize_keys(
+        'foo' => 'bar',
+        'aKey' => 'aValue',
+        'aa_key' => 'a_value',
+        key: :value,
+        sKey: :sValue,
+        us_key: :us_value,
+      ).should == {
+        'foo' => 'bar',
+        'aKey' => 'aValue',
+        'aaKey' => 'a_value',
+        'key' => :value,
+        'sKey' => :sValue,
+        'usKey' => :us_value,
+      }
+    end
+  end
+end

data/spec/runners/auth.rb

@@ -83,6 +83,9 @@ module Mongo
 
         if credential['username']
           expected_credential['user'] = credential['username']
+        end
+
+        if credential['password']
           expected_credential['password'] = credential['password']
         end
 

data/spec/runners/change_streams/test.rb

@@ -70,7 +70,7 @@ module Mongo
         if ClusterConfig.instance.server_version < '4.4' &&
           global_client.cluster.servers.length > 1
         then
-          mongos_each_direct_client do |client|
+          ::Utils.mongos_each_direct_client do |client|
             client.database.command(flushRouterConfig: 1)
           end
         end

data/spec/runners/connection_string.rb

@@ -84,20 +84,6 @@ RSpec::Matchers.define :match_auth do |test|
   end
 end
 
-RSpec::Matchers.define :match_options do |test|
-
-  match do |client|
-    options = test.options
-    return true unless options
-    options.match?(client.options)
-  end
-
-  failure_message do |client|
-    "With URI: #{test.uri_string}\n" +
-      "Expected that test options: #{test.options.options} would match client options: #{client.options}"
-  end
-end
-
 module Mongo
   module ConnectionString
 
@@ -159,7 +145,7 @@ module Mongo
       end
 
       def options
-        @options ||= Options.new(@spec['options']) if @spec['options']
+        @spec['options']
       end
 
       def client
@@ -239,115 +225,27 @@ module Mongo
       end
     end
 
-    class Options
-
-      MAPPINGS = {
-        # Connection and Replica Set Options
-        'replicaset' => :replica_set,
-        'directconnection' => :direct_connection,
-
-        # Timeout Options
-        'connecttimeoutms' => :connect_timeout,
-        'sockettimeoutms' => :socket_timeout,
-        'serverselectiontimeoutms' => :server_selection_timeout,
-        'localthresholdms' => :local_threshold,
-        'heartbeatfrequencyms' => :heartbeat_frequency,
-        'maxidletimems' => :max_idle_time,
-
-         # Write  Options
-        'journal' => [:write_concern, 'j'],
-        'w' => [:write_concern, 'w'],
-        'wtimeoutms' => [:write_concern, 'wtimeout'],
-
-        # Read Options
-        'readpreference' => ['read', 'mode'],
-        'readpreferencetags' => ['read', 'tag_sets'],
-        'maxstalenessseconds' => ['read', 'max_staleness'],
-
-        # Pool Options
-        'minpoolsize' => :min_pool_size,
-        'maxpoolsize' => :max_pool_size,
-
-        # Security Options
-        'tls' => :ssl,
-        'tlsallowinvalidcertificates' => :ssl_verify_certificate,
-        'tlsallowinvalidhostnames' => :ssl_verify_hostname,
-        'tlscafile' => :ssl_ca_cert,
-        'tlscertificatekeyfile' => :ssl_cert,
-        'tlscertificatekeyfilepassword' => :ssl_key_pass_phrase,
-        'tlsinsecure' => :ssl_verify,
-
-        # Auth Options
-        'authsource' => :auth_source,
-        'authmechanism' => :auth_mech,
-        'authmechanismproperties' => :auth_mech_properties,
-
-        # Client Options
-        'appname' => :app_name,
-        'readconcernlevel' => [:read_concern, 'level'],
-        'retrywrites' => :retry_writes,
-        'zlibcompressionlevel' => :zlib_compression_level,
-      }
-
-      attr_reader :options
-
-      def initialize(options)
-        @options = options
-      end
-
-      def match?(opts)
-        @options.all? do |k, v|
-          k = k.downcase
-
-          expected =
-            case k
-            when 'authmechanism'
-              Mongo::URI::AUTH_MECH_MAP[v].downcase.to_s
-            when 'authmechanismproperties'
-              v.reduce({}) do |new_v, prop|
-                prop_key = prop.first.downcase
-                prop_val = prop.last == 'true' ? true : prop.last
-                new_v[prop_key] = prop_val
-
-                new_v
-              end
-            when 'compressors'
-              v.dup.tap do |compressors|
-                # The Ruby driver doesn't support snappy
-                compressors.delete('snappy')
-              end
-            when 'readpreference'
-              Mongo::URI::READ_MODE_MAP[v.downcase].to_s
-            when 'tlsallowinvalidcertificates', 'tlsallowinvalidhostnames', 'tlsinsecure'
-              !v
-            else
-              if k.end_with?('ms') && k != 'wtimeoutms'
-                v / 1000.0
-              elsif v.is_a?(String)
-                v.downcase
-              else
-                v
-              end
-            end
-
-          actual =
-            case MAPPINGS[k]
-            when nil
-              opts[k]
-            when Array
-              opts[MAPPINGS[k].first][MAPPINGS[k].last]
-            else
-              opts[MAPPINGS[k]]
-            end
-
-          if actual.is_a?(Symbol)
-            actual = actual.to_s
+    module_function def adjust_expected_mongo_client_options(options)
+      expected = options.dup.tap do |expected|
+        expected.each do |k, v|
+          # Ruby driver downcases auth mechanism properties when
+          # constructing the client.
+          #
+          # Some tests give options in all lower case.
+          if k.downcase == 'authmechanismproperties'
+            expected[k] = ::Utils.downcase_keys(v)
           end
-          if actual.is_a?(String)
-            actual = actual.downcase
+        end
+        # We omit retryReads/retryWrites=true because some tests do not
+        # provide those.
+        %w(retryReads retryWrites).each do |k, v|
+          if expected[k] == true
+            expected.delete(k)
           end
-
-          expected == actual
+        end
+        # Fix appName case.
+        if expected.key?('appname') && !expected.key?('appName')
+          expected['appName'] = expected.delete('appname')
         end
       end
     end
@@ -406,8 +304,17 @@ def define_connection_string_spec_tests(test_paths, spec_cls = Mongo::Connection
               expect(test.client).to match_auth(test)
             end
 
-            it 'creates a client with the correct options' do
-              expect(test.client).to match_options(test)
+            if test.options
+              it 'creates a client with the correct options' do
+                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)
+                actual.delete('authsource')
+                expected = Mongo::ConnectionString.adjust_expected_mongo_client_options(
+                  test.options,
+                )
+                actual.should == expected
+              end
             end
 
             if test.read_concern_expectation

data/spec/runners/crud/requirement.rb

@@ -1,18 +1,39 @@
 module Mongo
   module CRUD
     class Requirement
-      YAML_KEYS = %w(minServerVersion maxServerVersion topology).freeze
+      YAML_KEYS = %w(minServerVersion maxServerVersion topology topologies serverParameters).freeze
 
       def initialize(spec)
+        spec = spec.dup
+        # Legacy tests have the requirements mixed with other test fields
+        spec.delete('data')
+        spec.delete('tests')
+
+        unless (unhandled_keys = spec.keys - YAML_KEYS).empty?
+          raise "Unhandled requirement specification keys: #{unhandled_keys}"
+        end
+
         @min_server_version = spec['minServerVersion']
         @max_server_version = spec['maxServerVersion']
-        @topologies = if topologies = spec['topology']
+        # topologies is for unified test format.
+        # topology is for legacy tests.
+        @topologies = if topologies = spec['topology'] || spec['topologies']
           topologies.map do |topology|
-            {'replicaset' => :replica_set, 'single' => :single, 'sharded' => :sharded}[topology]
+            {
+              'replicaset' => :replica_set,
+              'single' => :single,
+              'sharded' => :sharded,
+              'sharded-replicaset' => :sharded,
+            }[topology].tap do |v|
+              unless v
+                raise "Unknown topology #{topology}"
+              end
+            end
           end
         else
           nil
         end
+        @server_parameters = spec['serverParameters']
       end
 
       attr_reader :min_server_version
@@ -47,6 +68,22 @@ module Mongo
         if topologies
           ok &&= topologies.include?(cc.topology)
         end
+        if @server_parameters
+          @server_parameters.each do |k, required_v|
+            actual_v = cc.server_parameters[k]
+            if actual_v.nil? && !required_v.nil?
+              ok = false
+            elsif actual_v != required_v
+              if Numeric === actual_v && Numeric === required_v
+                if actual_v.to_f != required_v.to_f
+                  ok = false
+                end
+              else
+                ok = false
+              end
+            end
+          end
+        end
         ok
       end
 

data/spec/runners/crud/test_base.rb

@@ -45,25 +45,6 @@ module Mongo
           raise "Unknown target #{operation.object}"
         end
       end
-
-      # If the deployment is a sharded cluster, creates a direct client
-      # to each of the mongos nodes and yields each in turn to the
-      # provided block. Does nothing in other topologies.
-      def mongos_each_direct_client
-        if ClusterConfig.instance.topology == :sharded
-          client = ClientRegistry.instance.global_client('basic')
-          client.cluster.next_primary
-          client.cluster.servers.each do |server|
-            direct_client = ClientRegistry.instance.new_local_client(
-              [server.address.to_s],
-              SpecConfig.instance.test_options.merge(
-                connect: :sharded
-              ).merge(SpecConfig.instance.auth_options))
-            yield direct_client
-            direct_client.close
-          end
-        end
-      end
     end
   end
 end

data/spec/runners/crud/verifier.rb

@@ -193,6 +193,14 @@ EOT
           return
         end
 
+        if k == 'updateDescription'
+          # Change stream result - verify subset, not exact match
+          expected.fetch(k).each do |sub_k, sub_v|
+            {sub_k => sub_v}.should == {sub_k => actual.fetch(k).fetch(sub_k)}
+          end
+          return
+        end
+
         if expected[k].is_a?(Time)
           expect(k => actual[k].utc.to_s).to eq(k => expected[k].utc.to_s)
         else

data/spec/runners/server_selection.rb

@@ -123,7 +123,7 @@ end
 def define_server_selection_spec_tests(test_paths)
   # Linter insists that a server selection semaphore is present when
   # performing server selection.
-  skip_if_linting
+  require_no_linting
 
   test_paths.each do |file|
 

data/spec/runners/transactions/operation.rb

@@ -191,8 +191,19 @@ module Mongo
 
       def assert_event_count(client, context)
         events = _select_events(context)
-        unless events.length == arguments['count']
-          raise "Exppected #{arguments['count']} #{arguments['event']} events, but have #{events.length}"
+        if %w(ServerMarkedUnknownEvent PoolClearedEvent).include?(arguments['event'])
+          # We publish SDAM events from both regular and push monitors.
+          # This means sometimes there are two ServerMarkedUnknownEvent
+          # events published for the same server transition.
+          # Allow actual event count to be at least the expected event count
+          # in case there are multiple transitions in a single test.
+          unless events.length >= arguments['count']
+            raise "Expected #{arguments['count']} #{arguments['event']} events, but have #{events.length}"
+          end
+        else
+          unless events.length == arguments['count']
+            raise "Expected #{arguments['count']} #{arguments['event']} events, but have #{events.length}"
+          end
         end
       end
 

data/spec/runners/transactions/test.rb

@@ -224,7 +224,7 @@ module Mongo
         end
 
         if ClusterConfig.instance.fcv_ish >= '4.2'
-          mongos_each_direct_client do |direct_client|
+          ::Utils.mongos_each_direct_client do |direct_client|
             direct_client.command(configureFailPoint: 'failCommand', mode: 'off')
           end
         end
@@ -261,7 +261,7 @@ module Mongo
 
         $distinct_ran ||= {}
         $distinct_ran[@spec.database_name] ||= if description =~ /distinct/ || @operations.any? { |op| op.name == 'distinct' }
-          mongos_each_direct_client do |direct_client|
+          ::Utils.mongos_each_direct_client do |direct_client|
             direct_client.use(@spec.database_name)['test'].distinct('foo').to_a
           end
         end
@@ -289,6 +289,7 @@ module Mongo
             client.command(configureFailPoint: fail_point_command['configureFailPoint'],
               mode: 'off')
           end
+          $disable_fail_points = nil
         end
 
         if @test_client

data/spec/runners/unified.rb

@@ -0,0 +1,96 @@
+require 'runners/unified/error'
+require 'runners/unified/entity_map'
+require 'runners/unified/event_subscriber'
+require 'runners/unified/test'
+require 'runners/unified/test_group'
+require 'runners/unified/using_hash'
+
+def define_unified_spec_tests(base_path, paths, expect_failure: false)
+  paths.each do |path|
+    basename = path[base_path.length+1...path.length]
+    context basename do
+      group = Unified::TestGroup.new(path)
+
+      if basename =~ /retryable|transaction/
+        require_wired_tiger
+      end
+
+      group.tests.each do |test|
+        context test.description do
+
+          if test.skip?
+            before do
+              skip test.skip_reason
+            end
+          end
+
+          before(:all) do
+            if SpecConfig.instance.retry_reads == false
+              skip "Tests are not applicable when legacy read retries are used"
+            end
+            if SpecConfig.instance.retry_writes == false
+              skip "Tests are not applicable when legacy write retries are used"
+            end
+
+            if ClusterConfig.instance.topology == :sharded
+              if test.require_multiple_mongoses? && SpecConfig.instance.addresses.length == 1
+                skip "Test requires multiple mongoses"
+              elsif test.require_single_mongos? && SpecConfig.instance.addresses.length > 1
+                # Many transaction spec tests that do not specifically deal with
+                # sharded transactions fail when run against a multi-mongos cluster
+                skip "Test requires single mongos"
+              end
+            end
+          end
+
+          if expect_failure
+            it 'fails as expected' do
+              if test.group_reqs
+                unless test.group_reqs.any? { |r| r.satisfied? }
+                  skip "Group requirements not satisfied"
+                end
+              end
+              if test.reqs
+                unless test.reqs.any? { |r| r.satisfied? }
+                  skip "Requirements not satisfied"
+                end
+              end
+              begin
+                test.create_entities
+                test.set_initial_data
+                lambda do
+                  test.run
+                  test.assert_outcome
+                  test.assert_events
+                # HACK: other errors are possible and likely will need to
+                # be added here later as the tests evolve.
+                end.should raise_error(Mongo::Error::OperationFailure)
+              ensure
+                test.cleanup
+              end
+            end
+          else
+            it 'passes' do
+              if test.group_reqs
+                unless test.group_reqs.any? { |r| r.satisfied? }
+                  skip "Group requirements not satisfied"
+                end
+              end
+              if test.reqs
+                unless test.reqs.any? { |r| r.satisfied? }
+                  skip "Requirements not satisfied"
+                end
+              end
+              test.create_entities
+              test.set_initial_data
+              test.run
+              test.assert_outcome
+              test.assert_events
+              test.cleanup
+            end
+          end
+        end
+      end
+    end
+  end
+end