mongo 2.12.4 → 2.13.0.beta1

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

@@ -50,15 +50,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
@@ -102,6 +93,8 @@ module Mongo
       #   the phase.
       attr_reader :responses
 
+      attr_reader :application_errors
+
       # Create the new phase.
       #
       # @example Create the new phase.
@@ -113,8 +106,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
 
@@ -141,7 +135,38 @@ module Mongo
       def initialize(response, uri)
         @uri = uri
         @address = response[0]
-        @ismaster = response[1]
+        @ismaster = 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
 
@@ -179,14 +204,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
@@ -209,17 +234,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

data/spec/runners/sdam/verifier.rb

@@ -56,8 +56,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'
@@ -76,12 +76,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/runners/sdam_monitoring.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# 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.

data/spec/runners/transactions.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# 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.
@@ -24,7 +24,6 @@ def define_transactions_spec_tests(test_paths)
     spec = Mongo::Transactions::Spec.new(file)
 
     context(spec.description) do
-      require_wired_tiger
 
       define_spec_tests_with_requirements(spec) do |req|
         spec.tests.each do |test|

data/spec/runners/transactions/context.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019 MongoDB, Inc.
+# 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.

data/spec/runners/transactions/operation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# 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.
@@ -17,6 +17,10 @@ module Mongo
     class Operation < Mongo::CRUD::Operation
       include RSpec::Matchers
 
+      def needs_session?
+        arguments && arguments['session'] || object =~ /session/
+      end
+
       def execute(target, session0, session1, active_session=nil)
         session = case arguments && arguments['session']
         when 'session0'

data/spec/runners/transactions/spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# 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.

data/spec/runners/transactions/test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# 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.
@@ -20,18 +20,6 @@ module Mongo
     # @since 2.6.0
     class TransactionsTest < CRUD::CRUDTestBase
 
-      # The test description.
-      #
-      # @return [ String ] description The test description.
-      #
-      # @since 2.6.0
-      attr_reader :description
-
-      # The expected command monitoring events
-      #
-      # @since 2.6.0
-      attr_reader :expectations
-
       attr_reader :expected_results
       attr_reader :skip_reason
 
@@ -54,6 +42,9 @@ module Mongo
         @data = data
         @description = test['description']
         @client_options = Utils.convert_client_options(test['clientOptions'] || {})
+
+        @fail_point_command = test['failPoint']
+
         @session_options = if opts = test['sessionOptions']
           Hash[opts.map do |session_name, options|
             [session_name.to_sym, Utils.convert_operation_options(options)]
@@ -61,12 +52,11 @@ module Mongo
         else
           {}
         end
-        @fail_point = test['failPoint']
         @skip_reason = test['skipReason']
         @multiple_mongoses = test['useMultipleMongoses']
 
-        @operations = test['operations']
-        @ops = @operations.map do |op|
+        operations = test['operations']
+        @operations = operations.map do |op|
           Operation.new(self, op)
         end
 
@@ -76,7 +66,7 @@ module Mongo
           @outcome = Mongo::CRUD::Outcome.new(BSON::ExtJSON.parse_obj(test['outcome'], mode: :bson))
         end
 
-        @expected_results = @operations.map do |o|
+        @expected_results = operations.map do |o|
           o = BSON::ExtJSON.parse_obj(o)
 
           # We check both o.key('error') and o['error'] to provide a better
@@ -128,21 +118,6 @@ module Mongo
         @event_subscriber ||= EventSubscriber.new
       end
 
-      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
-          end
-        end
-      end
-
       # Run the test.
       #
       # @example Run the test.
@@ -154,16 +129,23 @@ module Mongo
       def run
         test_client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
 
-        results = @ops.map do |op|
+        results = @operations.map do |op|
           target = resolve_target(test_client, op)
-          op.execute(target, @session0, @session1)
+          if op.needs_session?
+            op.execute(target, session0, session1)
+          else
+            # Hack to support write concern operations tests, which are
+            # defined to use transactions format but target pre-3.6 servers
+            # that do not support sessions
+            op.execute(target || support_client, nil, nil)
+          end
         end
 
-        session0_id = @session0.session_id
-        session1_id = @session1.session_id
+        session0_id = @session0&.session_id
+        session1_id = @session1&.session_id
 
-        @session0.end_session
-        @session1.end_session
+        @session0&.end_session
+        @session1&.end_session
 
         actual_events = Utils.yamlify_command_events(event_subscriber.started_events)
         actual_events = actual_events.reject do |event|
@@ -173,8 +155,12 @@ module Mongo
 
           # Replace the session id placeholders with the actual session ids.
           payload = e['command_started_event']
-          payload['command']['lsid'] = 'session0' if payload['command']['lsid'] == session0_id
-          payload['command']['lsid'] = 'session1' if payload['command']['lsid'] == session1_id
+          if @session0
+            payload['command']['lsid'] = 'session0' if payload['command']['lsid'] == session0_id
+          end
+          if @session1
+            payload['command']['lsid'] = 'session1' if payload['command']['lsid'] == session1_id
+          end
 
         end
 
@@ -194,8 +180,10 @@ module Mongo
         rescue Mongo::Error
         end
 
-        mongos_each_direct_client do |direct_client|
-          direct_client.command(configureFailPoint: 'failCommand', mode: 'off')
+        if ClusterConfig.instance.fcv_ish >= '4.2'
+          mongos_each_direct_client do |direct_client|
+            direct_client.command(configureFailPoint: 'failCommand', mode: 'off')
+          end
         end
 
         # Insert data into the key vault collection if required to do so by
@@ -223,40 +211,38 @@ module Mongo
         support_client.command(
           create: @spec.collection_name,
           validator: collection_validator,
-          writeConcern: { w: :majority }
+          writeConcern: { w: 'majority' }
         )
 
         coll.insert_many(@data) unless @data.empty?
 
-        $distinct_ran ||= if description =~ /distinct/ || @ops.any? { |op| op.name == 'distinct' }
+        $distinct_ran ||= if description =~ /distinct/ || @operations.any? { |op| op.name == 'distinct' }
           mongos_each_direct_client do |direct_client|
             direct_client['test'].distinct('foo').to_a
           end
         end
 
-        admin_support_client.command(@fail_point) if @fail_point
+        admin_support_client.command(@fail_point_command) if @fail_point_command
 
         @collection = test_client[@spec.collection_name]
 
         # Client-side encryption tests require the use of a separate client
         # without auto_encryption_options for querying results.
-        @result_collection = support_client.use(@spec.database_name)[@spec.collection_name]
-
-        @session0 = test_client.start_session(@session_options[:session0] || {})
-        @session1 = test_client.start_session(@session_options[:session1] || {})
+        result_collection_name = outcome&.collection_name || @spec.collection_name
+        @result_collection = support_client.use(@spec.database_name)[result_collection_name]
       end
 
       def teardown_test
 
-        if @fail_point
+        if @fail_point_command
           admin_support_client.command(configureFailPoint: 'failCommand', mode: 'off')
         end
 
         if $disable_fail_points
-          $disable_fail_points.each do |(fail_point, address)|
+          $disable_fail_points.each do |(fail_point_command, address)|
             client = ClusterTools.instance.direct_client(address,
               database: 'admin')
-            client.command(configureFailPoint: fail_point['configureFailPoint'],
+            client.command(configureFailPoint: fail_point_command['configureFailPoint'],
               mode: 'off')
           end
         end
@@ -269,9 +255,9 @@ module Mongo
       def resolve_target(client, operation)
         case operation.object
         when 'session0'
-          @session0
+          session0
         when 'session1'
-          @session1
+          session1
         when 'testRunner'
           # We don't actually use this target in any way.
           nil
@@ -279,6 +265,14 @@ module Mongo
           super
         end
       end
+
+      def session0
+        @session0 ||= test_client.start_session(@session_options[:session0] || {})
+      end
+
+      def session1
+        @session1 ||= test_client.start_session(@session_options[:session1] || {})
+      end
     end
   end
 end

data/spec/spec_tests/auth_spec.rb

@@ -1,5 +1,7 @@
 require 'lite_spec_helper'
 
+require 'runners/auth'
+
 describe 'Auth' do
   include Mongo::Auth
 

data/spec/spec_tests/change_streams_spec.rb

@@ -1,7 +1,11 @@
 require 'spec_helper'
 
+require 'runners/crud'
+require 'runners/change_streams/spec'
+
 describe 'ChangeStreams' do
   require_wired_tiger
+  require_no_multi_shard
 
   CHANGE_STREAMS_TESTS.each do |file|
 
@@ -14,7 +18,7 @@ describe 'ChangeStreams' do
         context(test.description) do
           require_topology *test.topologies
 
-          before(:each) do
+          before do
             unless test.server_version_satisfied?(authorized_client)
               skip 'Version requirements not satisfied'
             end
@@ -22,14 +26,45 @@ describe 'ChangeStreams' do
             test.setup_test
           end
 
+          after do
+            test.teardown_test
+          end
+
           let(:result) do
             test.run
           end
 
           let(:verifier) { Mongo::CRUD::Verifier.new(test) }
 
-          it 'returns the correct result' do
-            expect(result[:result]).to match_result(test)
+          if test.outcome.error?
+            let(:actual_error) { result[:result][:error] }
+
+            it 'fails' do
+              actual_error[:code].should == test.outcome.error.fetch('code')
+            end
+
+            if test.outcome.error['errorLabels']
+              it 'has correct error labels' do
+                actual_error[:labels].should == test.outcome.error.fetch('errorLabels')
+              end
+            end
+          else
+            let(:actual_documents) do
+              result[:result]['success'].map do |document|
+                document = document.dup
+                fd = document['fullDocument']
+                if fd
+                  fd = fd.dup
+                  fd.delete('_id')
+                  document['fullDocument'] = fd
+                end
+                document
+              end
+            end
+
+            it 'has the correct documents' do
+              verifier.verify_operation_result(test.result['success'], actual_documents)
+            end
           end
 
           if test.expectations
@@ -38,7 +73,7 @@ describe 'ChangeStreams' do
             end
 
             it 'has the correct number of command_started events' do
-              verifier.verify_command_started_event_count(test.expectations, actual_events)
+              verifier.verify_command_started_event_min_count(test.expectations, actual_events)
             end
 
             test.expectations.each_with_index do |expectation, i|