mongo 2.10.5 → 2.15.1

data/spec/runners/crud/test_base.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module Mongo
+  module CRUD
+
+    class CRUDTestBase
+
+      # The test description.
+      #
+      # @return [ String ] description The test description.
+      attr_reader :description
+
+      # The expected command monitoring events.
+      attr_reader :expectations
+
+      def setup_fail_point(client)
+        if @fail_point_command
+          client.use(:admin).command(@fail_point_command)
+        end
+      end
+
+      def clear_fail_point(client)
+        if @fail_point_command
+          client.use(:admin).command(BSON::Document.new(@fail_point_command).merge(mode: "off"))
+        end
+      end
+
+      private
+
+      def resolve_target(client, operation)
+        if operation.database_options
+          # Some CRUD spec tests specify "database options". In Ruby there is
+          # no facility to specify options on a database, hence these are
+          # lifted to the client.
+          client = client.with(operation.database_options)
+        end
+        case operation.object
+        when 'collection'
+          client[@spec.collection_name].with(operation.collection_options)
+        when 'database'
+          client.database
+        when 'client'
+          client
+        when 'gridfsbucket'
+          client.database.fs
+        else
+          raise "Unknown target #{operation.object}"
+        end
+      end
+    end
+  end
+end

data/spec/{support → runners}/crud/verifier.rb

@@ -1,4 +1,7 @@
-# Copyright (C) 2019 MongoDB, Inc.
+# frozen_string_literal: true
+# encoding: utf-8
+
+# Copyright (C) 2019-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,12 +37,7 @@ module Mongo
           expect(actual_collection_data).to be_empty
         else
           expect(actual_collection_data).not_to be nil
-          expected_collection_data.each do |doc|
-            expect(actual_collection_data).to include(doc)
-          end
-          actual_collection_data.each do |doc|
-            expect(expected_collection_data).to include(doc)
-          end
+          expect(actual_collection_data).to match_with_type(expected_collection_data)
         end
       end
 
@@ -76,6 +74,18 @@ EOT
         end
       end
 
+      # This variant used by change stream tests which provide the first N
+      # events rather than all of them.
+      def verify_command_started_event_min_count(expected_events, actual_events)
+        if actual_events.length < expected_events.length
+          raise RSpec::Expectations::ExpectationNotMetError.new, <<-EOT
+Expected at least #{expected_events.length} events, got #{actual_events.length} events.
+Expected events: #{expected_events.pretty_inspect}
+Actual events: #{actual_events.pretty_inspect}
+EOT
+        end
+      end
+
       def verify_command_started_event(expected_events, actual_events, i)
         expect(expected_events.length).to be > i
         expect(actual_events.length).to be > i
@@ -105,15 +115,14 @@ EOT
         expected_absence = expected_command.select { |k, v| v.nil? }
 
         expected_presence.each do |k, v|
-          expect(k => actual_command[k]).to eq(k => v)
+          expect(actual_command[k]).to match_with_type(v)
         end
 
         expected_absence.each do |k, v|
           expect(actual_command).not_to have_key(k)
         end
 
-        # this compares remaining fields in events after command is removed
-        expect(actual_event).to eq(expected_event)
+        expect(actual_event).to match_with_type(expected_event)
       end
 
       private
@@ -122,6 +131,8 @@ EOT
         case expected
         when nil
           expect(actual).to be nil
+        when 42, '42'
+          expect(actual).not_to be nil
         when Hash
           if actual.is_a?(Hash) && actual['error'] &&
             !expected.keys.any? { |key| key.start_with?('error') }
@@ -161,6 +172,10 @@ EOT
           return
         end
 
+        if [42, '42'].include?(expected[k]) && actual[k]
+          return
+        end
+
         if %w(deletedCount matchedCount modifiedCount upsertedCount).include?(k)
           # Some tests assert that some of these counts are zero.
           # The driver may omit the respective key, which is fine.
@@ -181,9 +196,21 @@ EOT
           return
         end
 
-        # This should produce a meaningful error message,
-        # even though we do not actually require that expected[k] == actual[k]
-        expect({k => expected[k]}).to eq({k => actual[k]})
+        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
+          # This should produce a meaningful error message,
+          # even though we do not actually require that expected[k] == actual[k]
+          expect(k => actual[k]).to eq(k => expected[k])
+        end
       end
     end
   end

data/spec/{support → runners}/crud.rb

@@ -1,4 +1,7 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# frozen_string_literal: true
+# encoding: utf-8
+
+# Copyright (C) 2014-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,15 +15,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'support/gridfs'
-require 'support/crud/requirement'
-require 'support/crud/spec'
-require 'support/crud/test_base'
-require 'support/crud/test'
-require 'support/crud/outcome'
-require 'support/crud/context'
-require 'support/crud/operation'
-require 'support/crud/verifier'
+require 'runners/gridfs'
+require 'runners/crud/requirement'
+require 'runners/crud/spec'
+require 'runners/crud/test_base'
+require 'runners/crud/test'
+require 'runners/crud/outcome'
+require 'runners/crud/context'
+require 'runners/crud/operation'
+require 'runners/crud/verifier'
 
 def collection_data(collection)
   collection.find.to_a
@@ -47,7 +50,7 @@ def crud_execute_operations(spec, test, num_ops, event_subscriber, expect_error,
       res = nil
       begin
         res = test.run(client, num_ops)
-      rescue => e
+      rescue Mongo::Error => e
         res = e
       end
       res
@@ -122,6 +125,15 @@ def define_crud_spec_test_examples(spec, req = nil, &block)
           if operation.outcome.error?
             it 'raises an error' do
               expect(result).to be_a(Mongo::Error)
+              if operation.outcome.result
+                verifier.verify_operation_result(
+                  operation.outcome.result,
+                  {
+                    'errorContains' => result.message,
+                    'errorLabels' => result.labels,
+                  }
+                )
+              end
             end
           else
             tested = false
@@ -212,6 +224,16 @@ def define_spec_tests_with_requirements(spec, &block)
         if req.topologies
           require_topology *req.topologies
         end
+        if SpecConfig.instance.serverless? && req.serverless == :forbid
+          before(:all) do
+            skip "Serverless forbidden"
+          end
+        end
+        if !SpecConfig.instance.serverless? && req.serverless == :require
+          before(:all) do
+            skip "Serverless required"
+          end
+        end
 
         instance_exec(req, &block)
       end

data/spec/{support → runners}/gridfs.rb

@@ -1,4 +1,7 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# frozen_string_literal: true
+# encoding: utf-8
+
+# Copyright (C) 2014-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -93,15 +96,12 @@ module Mongo
 
       # Instantiate the new spec.
       #
-      # @example Create the spec.
-      #   Spec.new(file)
-      #
-      # @param [ String ] file The name of the file.
+      # @param [ String ] test_path The path to the file.
       #
       # @since 2.1.0
-      def initialize(file)
-        @spec = YAML.load(ERB.new(File.new(file).read).result)
-        @description = File.basename(file)
+      def initialize(test_path)
+        @spec = YAML.load(File.read(test_path))
+        @description = File.basename(test_path)
         @data = @spec['data']
       end
 

data/spec/runners/read_write_concern_document.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module ReadWriteConcernDocument
+
+  class Spec
+
+    attr_reader :description
+
+    # Instantiate the new spec.
+    #
+    # @param [ String ] test_path The path to the file.
+    #
+    # @since 2.0.0
+    def initialize(test_path)
+      @spec = YAML.load(File.read(test_path))
+      @description = File.basename(test_path)
+    end
+
+    def tests
+      @tests ||= @spec['tests'].collect do |spec|
+        Test.new(spec)
+      end
+    end
+  end
+
+  class Test
+    def initialize(spec)
+      @spec = spec
+      @description = @spec['description']
+      @uri_string = @spec['uri']
+    end
+
+    attr_reader :description
+
+    def valid?
+      !!@spec['valid']
+    end
+
+    def input_document
+      (@spec['readConcern'] || @spec['writeConcern']).tap do |concern|
+        # Documented Ruby API matches the server API, and Ruby prohibits
+        # journal key as used in the spec tests...
+        if concern.key?('journal')
+          concern['j'] = concern.delete('journal')
+        end
+        # ... and uses wtimeout instead of wtimeoutMS
+        if concern.key?('wtimeoutMS')
+          concern['wtimeout'] = concern.delete('wtimeoutMS')
+        end
+      end
+    end
+
+    def server_document
+      @spec['readConcernDocument'] || @spec['writeConcernDocument']
+    end
+
+    # Returns true, false or nil
+    def server_default?
+      # Do not convert to boolean
+      @spec['isServerDefault']
+    end
+
+    # Returns true, false or nil
+    def acknowledged?
+      # Do not convert to boolean
+      @spec['isAcknowledged']
+    end
+  end
+end

data/spec/runners/sdam/verifier.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Sdam
   class Verifier
     include RSpec::Matchers
@@ -37,10 +40,13 @@ module Sdam
         verify_description_matches(server, desc)
       end
 
+      # Verify actual topology has no servers not also present in the
+      # expected topology description.
+      expected_addresses = expected['servers'].map do |server|
+        server['address']
+      end
       actual.server_descriptions.keys.each do |address_str|
-        expect(
-          expected['servers'].any? { |server| server['address'] == address_str }
-        ).to be true
+        expect(expected_addresses).to include(address_str)
       end
     end
 
@@ -53,8 +59,8 @@ module Sdam
       verify_description_matches(expected.data['newDescription'], actual.new_description)
     end
 
-    def verify_description_matches(expected, actual)
-      case expected['type']
+    def verify_description_matches(server_spec, actual)
+      case server_spec['type']
       when 'Standalone'
         expect(actual).to be_standalone
       when 'RSPrimary'
@@ -73,12 +79,30 @@ module Sdam
         expect(actual).to be_other
       end
 
-      expect(actual.address.to_s).to eq(expected['address'])
-      expect(actual.arbiters).to eq(expected['arbiters'])
-      expect(actual.hosts).to eq(expected['hosts'])
-      expect(actual.passives).to eq(expected['passives'])
-      expect(actual.primary_host).to eq(expected['primary'])
-      expect(actual.replica_set_name).to eq(expected['setName'])
+      if server_spec['arbiters']
+        expect(actual.arbiters).to eq(server_spec['arbiters'])
+      end
+      if server_spec['hosts']
+        expect(actual.hosts).to eq(server_spec['hosts'])
+      end
+      if server_spec['passives']
+        expect(actual.passives).to eq(server_spec['passives'])
+      end
+      if server_spec['primary']
+        expect(actual.primary_host).to eq(server_spec['primary'])
+      end
+      expect(actual.replica_set_name).to eq(server_spec['setName'])
+
+      if server_spec['topologyVersion']
+        # In the Ruby TopologyVersion object, the counter is a
+        # Ruby integer. It would serialize to BSON int.
+        # The expected topology version specifies counter as a
+        # BSON long.
+        # Parse expected value as extended json and compare
+        # Ruby objects.
+        expected_tv = server_spec['topologyVersion']
+        expect(actual.topology_version).to eq(expected_tv)
+      end
     end
 
     def verify_server_closed_event(expected, actual)

data/spec/{support/server_discovery_and_monitoring.rb → runners/sdam.rb}

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # Matcher for determining if the server is of the expected type according to
 # the test.
 #
@@ -34,6 +37,8 @@ module Mongo
           when 'PossiblePrimary' then server.unknown?
           when 'RSGhost' then server.ghost?
           when 'RSOther' then server.other?
+          else
+            raise "Unknown type #{type}"
         end
       end
     end
@@ -48,15 +53,6 @@ module Mongo
       client.cluster.servers_list.detect{ |s| s.address.to_s == address_str }
     end
 
-    # Helper to convert an extended JSON ObjectId electionId to BSON::ObjectId.
-    #
-    # @since 2.1.0
-    def self.convert_election_ids(docs)
-      docs.each do |doc |
-        doc['electionId'] = BSON::ObjectId.from_string(doc['electionId']['$oid']) if doc['electionId']
-      end
-    end
-
     # Represents a specification.
     #
     # @since 2.0.0
@@ -76,16 +72,11 @@ module Mongo
 
       # Instantiate the new spec.
       #
-      # @example Create the spec.
-      #   Spec.new(file)
-      #
-      # @param [ String ] file The name of the file.
+      # @param [ String ] test_path The path to the file.
       #
       # @since 2.0.0
-      def initialize(file)
-        file = File.new(file)
-        @test = YAML.load(ERB.new(file.read).result)
-        file.close
+      def initialize(test_path)
+        @test = YAML.load(File.read(test_path))
         @description = @test['description']
         @uri_string = @test['uri']
         @uri = URI.new(uri_string)
@@ -105,6 +96,8 @@ module Mongo
       #   the phase.
       attr_reader :responses
 
+      attr_reader :application_errors
+
       # Create the new phase.
       #
       # @example Create the new phase.
@@ -116,8 +109,9 @@ module Mongo
       # @since 2.0.0
       def initialize(phase, uri)
         @phase = phase
-        @responses = @phase['responses'].map{ |response| Response.new(SDAM::convert_election_ids(response), uri) }
-        @outcome = Outcome.new(@phase['outcome'])
+        @responses = @phase['responses']&.map{ |response| Response.new(response, uri) }
+        @application_errors = @phase['applicationErrors']&.map{ |error_spec| ApplicationError.new(error_spec) }
+        @outcome = Outcome.new(BSON::ExtJSON.parse_obj(@phase['outcome']))
       end
     end
 
@@ -129,8 +123,8 @@ module Mongo
       # @return [ String ] address The server address.
       attr_reader :address
 
-      # @return [ Hash ] ismaster The ismaster response.
-      attr_reader :ismaster
+      # @return [ Hash ] hello The hello response.
+      attr_reader :hello
 
       # Create the new response.
       #
@@ -144,7 +138,38 @@ module Mongo
       def initialize(response, uri)
         @uri = uri
         @address = response[0]
-        @ismaster = response[1]
+        @hello = BSON::ExtJSON.parse_obj(response[1])
+      end
+    end
+
+    class ApplicationError
+      def initialize(spec)
+        @spec = spec
+      end
+
+      def address_str
+        @spec.fetch('address')
+      end
+
+      def when
+        ::Utils.underscore(@spec.fetch('when'))
+      end
+
+      def max_wire_version
+        @spec['max_wire_version']
+      end
+
+      def generation
+        @spec['generation']
+      end
+
+      def type
+        ::Utils.underscore(@spec.fetch('type'))
+      end
+
+      def result
+        msg = Mongo::Protocol::Msg.new([], {}, BSON::ExtJSON.parse_obj(@spec['response']))
+        Mongo::Operation::Result.new([msg])
       end
     end
 
@@ -182,14 +207,14 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(outcome)
-        @servers = process_servers(outcome['servers']) if outcome['servers']
+        @servers = outcome['servers'] if outcome['servers']
         @set_name = outcome['setName']
         @topology_type = outcome['topologyType']
         @logical_session_timeout = outcome['logicalSessionTimeoutMinutes']
-        @events = process_events(outcome['events']) if outcome['events']
+        @events = map_events(outcome['events']) if outcome['events']
         @compatible = outcome['compatible']
         if outcome['maxElectionId']
-          @max_election_id = BSON::ObjectId.from_string(outcome['maxElectionId']['$oid'])
+          @max_election_id = outcome['maxElectionId']
         end
         @max_set_version = outcome['maxSetVersion']
       end
@@ -212,17 +237,11 @@ module Mongo
 
       private
 
-      def process_events(events)
+      def map_events(events)
         events.map do |event|
           Event.new(event.keys.first, event.values.first)
         end
       end
-
-      def process_servers(servers)
-        servers.each do |s|
-          SDAM::convert_election_ids([ s[1] ])
-        end
-      end
     end
 
     class Event