mongo 2.9.2 → 2.10.0.rc0

data/spec/support/transactions/spec.rb

@@ -18,9 +18,7 @@ module Mongo
     class Spec < Mongo::CRUD::Spec
       def tests
         @tests.map do |test|
-          lambda do
-            Mongo::Transactions::TransactionsTest.new(@data, test, self)
-          end
+          Mongo::Transactions::TransactionsTest.new(self, @data, test)
         end
       end
     end

data/spec/support/transactions/test.rb

@@ -18,7 +18,7 @@ module Mongo
     # Represents a single transaction test.
     #
     # @since 2.6.0
-    class TransactionsTest
+    class TransactionsTest < CRUD::CRUDTestBase
 
       # The test description.
       #
@@ -42,35 +42,57 @@ module Mongo
       # @example Create the test.
       #   TransactionTest.new(data, test)
       #
+      # @param [ Crud::Spec ] crud_spec The top level YAML specification object.
       # @param [ Array<Hash> ] data The documents the collection
       # must have before the test runs.
       # @param [ Hash ] test The test specification.
-      # @param [ Hash ] spec The top level YAML specification.
       #
       # @since 2.6.0
-      def initialize(data, test, spec)
+      def initialize(crud_spec, data, test)
         test = IceNine.deep_freeze(test)
-        @spec = spec
+        @spec = crud_spec
         @data = data
         @description = test['description']
         @client_options = Utils.convert_client_options(test['clientOptions'] || {})
-        @session_options = Utils.snakeize_hash(test['sessionOptions'] || {})
+        @session_options = if opts = test['sessionOptions']
+          Hash[opts.map do |session_name, options|
+            [session_name.to_sym, Utils.convert_operation_options(options)]
+          end]
+        else
+          {}
+        end
         @fail_point = test['failPoint']
+        @skip_reason = test['skipReason']
+        @multiple_mongoses = test['useMultipleMongoses']
+
         @operations = test['operations']
+        @ops = @operations.map do |op|
+          Operation.new(self, op)
+        end
+
         @expectations = test['expectations']
-        @skip_reason = test['skipReason']
         if test['outcome']
           @outcome = Mongo::CRUD::Outcome.new(test['outcome'])
         end
         @expected_results = @operations.map do |o|
-          result = o['result']
-          next result unless result.class == Hash
-
-          # Change maps of result ids to arrays of ids
-          result.dup.tap do |r|
-            r.each do |k, v|
-              next unless ['insertedIds', 'upsertedIds'].include?(k)
-              r[k] = v.to_a.sort_by(&:first).map(&:last)
+          # We check both o.key('error') and o['error'] to provide a better
+          # error message in case error: false is ever needed in the tests
+          if o.key?('error')
+            if o['error']
+              {'error' => true}
+            else
+              raise "Unsupported error value #{o['error']}"
+            end
+          else
+            result = o['result']
+            next result unless result.class == Hash
+
+            # Change maps of result ids to arrays of ids
+            result.dup.tap do |r|
+              r.each do |k, v|
+                next unless ['insertedIds', 'upsertedIds'].include?(k)
+                r[k] = v.to_a.sort_by(&:first).map(&:last)
+              end
             end
           end
         end
@@ -78,6 +100,10 @@ module Mongo
 
       attr_reader :outcome
 
+      def multiple_mongoses?
+        @multiple_mongoses
+      end
+
       def support_client
         @support_client ||= ClientRegistry.instance.global_client('root_authorized').use(@spec.database_name)
       end
@@ -87,16 +113,32 @@ module Mongo
       end
 
       def test_client
-        @test_client ||= ClientRegistry.instance.global_client('authorized_without_retry_writes').with(
-          @client_options.merge(
-            database: @spec.database_name,
-            app_name: 'this is used solely to force the new client to create its own cluster'))
+        @test_client ||= ClientRegistry.instance.global_client(
+          'authorized_without_retry_writes'
+        ).with(@client_options.merge(
+          database: @spec.database_name,
+        ))
       end
 
       def event_subscriber
         @event_subscriber ||= EventSubscriber.new
       end
 
+      def mongos_each_direct_client
+        if ClusterConfig.instance.mongos?
+          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.
@@ -108,23 +150,9 @@ module Mongo
       def run
         test_client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
 
-        $distinct_ran ||= if @ops.any? { |op| op.name == 'distinct' }
-          if ClusterConfig.instance.mongos?
-            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))
-              direct_client['test'].distinct('foo').to_a
-            end
-          end
-        end
-
         results = @ops.map do |op|
-          op.execute(@collection)
+          target = resolve_target(test_client, op)
+          op.execute(target, @session0, @session1)
         end
 
         session0_id = @session0.session_id
@@ -134,6 +162,9 @@ module Mongo
         @session1.end_session
 
         actual_events = Utils.yamlify_command_events(event_subscriber.started_events)
+        actual_events = actual_events.reject do |event|
+          event['command_started_event']['command']['endSessions']
+        end
         actual_events.each do |e|
 
           # Replace the session id placeholders with the actual session ids.
@@ -143,13 +174,12 @@ module Mongo
 
         end
 
-        if @fail_point
-          admin_support_client.command(configureFailPoint: 'failCommand', mode: 'off')
-        end
-
         @results = {
           results: results,
-          contents: @collection.with(read_concern: { level: 'local' }).find.to_a,
+          contents: @collection.with(
+          read: {mode: 'primary'},
+            read_concern: { level: 'local' },
+          ).find.to_a,
           events: actual_events,
         }
       end
@@ -160,30 +190,61 @@ module Mongo
         rescue Mongo::Error
         end
 
-        coll = support_client[@spec.collection_name]
+        mongos_each_direct_client do |direct_client|
+          direct_client.command(configureFailPoint: 'failCommand', mode: 'off')
+        end
+
+        coll = support_client[@spec.collection_name].with(write: { w: :majority })
         coll.drop
-        coll.with(write: { w: :majority }).drop
         support_client.command(create: @spec.collection_name, writeConcern: { w: :majority })
 
-        coll.with(write: { w: :majority }).insert_many(@data) unless @data.empty?
+        coll.insert_many(@data) unless @data.empty?
+
+        $distinct_ran ||= if description =~ /distinct/ || @ops.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
 
         @collection = test_client[@spec.collection_name]
 
         @session0 = test_client.start_session(@session_options[:session0] || {})
         @session1 = test_client.start_session(@session_options[:session1] || {})
-
-        @ops = @operations.map do |op|
-          Operation.new(op, @session0, @session1)
-        end
       end
 
       def teardown_test
-        if @admin_support_client
-          @admin_support_client.close
+
+        if @fail_point
+          admin_support_client.command(configureFailPoint: 'failCommand', mode: 'off')
+        end
+
+        if $disable_fail_points
+          $disable_fail_points.each do |(fail_point, address)|
+            client = ClusterTools.instance.direct_client(address,
+              database: 'admin')
+            client.command(configureFailPoint: fail_point['configureFailPoint'],
+              mode: 'off')
+          end
         end
+
         if @test_client
-          @test_client.close
+          @test_client.cluster.session_pool.end_sessions
+        end
+      end
+
+      def resolve_target(client, operation)
+        case operation.object
+        when 'session0'
+          @session0
+        when 'session1'
+          @session1
+        when 'testRunner'
+          # We don't actually use this target in any way.
+          nil
+        else
+          super
         end
       end
     end

data/spec/support/utils.rb

@@ -3,7 +3,7 @@ module Utils
   # Converts a 'camelCase' string or symbol to a :under_score symbol.
   def underscore(str)
     str = str.to_s
-    str = str[0].downcase + str[1...str.length].gsub(/([A-Z])/) { |m| "_#{m.downcase}" }
+    str = str[0].downcase + str[1...str.length].gsub(/([A-Z]+)/) { |m| "_#{m.downcase}" }
     str.to_sym
   end
   module_function :underscore
@@ -23,6 +23,28 @@ module Utils
   end
   module_function :snakeize_hash
 
+  # Like snakeize_hash but does not recurse.
+  def shallow_snakeize_hash(value)
+    return underscore(value) if value.is_a?(String)
+    return value unless value.is_a?(Hash)
+
+    value.reduce({}) do |hash, (k, v)|
+      hash.tap do |h|
+        h[underscore(k)] = v
+      end
+    end
+  end
+  module_function :shallow_snakeize_hash
+
+  def camelize(str, upcase_first = true)
+    str = str.gsub(%r,_(\w),) { |m| m[1].upcase }
+    if upcase_first
+      str = str[0].upcase + str[1...str.length]
+    end
+    str
+  end
+  module_function :camelize
+
   # Converts camel case clientOptions, as used in spec tests,
   # to Ruby driver underscore options.
   def convert_client_options(spec_test_options)
@@ -78,6 +100,10 @@ module Utils
         end
       end
 
+      if command['recoveryToken']
+        command['recoveryToken'] = 42
+      end
+
       # The spec tests use 42 as a placeholder value for any getMore cursorId.
       command['getMore'] = { '$numberLong' => '42' } if command['getMore']
 
@@ -111,4 +137,51 @@ module Utils
     events
   end
   module_function :yamlify_command_events
+
+  def convert_operation_options(options)
+    if options
+      Hash[options.map do |k, v|
+        out_v = case k
+        when 'readPreference'
+          out_k = :read
+          out_v = {}
+          v.each do |sub_k, sub_v|
+            if sub_k == 'mode'
+              out_v[:mode] = Utils.underscore(v['mode'])
+            else
+              out_v[sub_k.to_sym] = sub_v
+            end
+          end
+          out_v
+        when 'defaultTransactionOptions'
+          out_k = Utils.underscore(k).to_sym
+          convert_operation_options(v)
+        when 'readConcern'
+          out_k = Utils.underscore(k).to_sym
+          Mongo::Options::Mapper.transform_keys_to_symbols(v).tap do |out|
+            if out[:level]
+              out[:level] = out[:level].to_sym
+            end
+          end
+        when 'causalConsistency'
+          out_k = Utils.underscore(k).to_sym
+          v
+        when 'writeConcern'
+          # Write concern option is called :write on the client, but
+          # :write_concern on all levels below the client.
+          out_k = :write_concern
+          # The client expects write concern value to only have symbol keys.
+          Hash[v.map do |sub_k, sub_v|
+            [sub_k.to_sym, sub_v]
+          end]
+        else
+          raise "Unhandled operation option #{k}"
+        end
+        [out_k, out_v]
+      end]
+    else
+      {}
+    end
+  end
+  module_function :convert_operation_options
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.10.0.rc0
 platform: ruby
 authors:
 - Tyler Brock
@@ -31,7 +31,7 @@ cert_chain:
   bMYVwXXhV8czdzgkQB/ZPWHSbEWXnmkze1mzvqWBCPOVXYrcnL9cnEl/RoxtS1hr
   Db6Ac6mCUSYfYHBWpWqxjc45n70i5Xi1
   -----END CERTIFICATE-----
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -111,6 +111,7 @@ files:
 - lib/mongo/cluster/topology/sharded.rb
 - lib/mongo/cluster/topology/single.rb
 - lib/mongo/cluster/topology/unknown.rb
+- lib/mongo/cluster_time.rb
 - lib/mongo/collection.rb
 - lib/mongo/collection/view.rb
 - lib/mongo/collection/view/aggregation.rb
@@ -358,6 +359,7 @@ files:
 - lib/mongo/operation/shared/result/use_legacy_error_parser.rb
 - lib/mongo/operation/shared/sessions_supported.rb
 - lib/mongo/operation/shared/specifiable.rb
+- lib/mongo/operation/shared/unpinnable.rb
 - lib/mongo/operation/shared/write.rb
 - lib/mongo/operation/shared/write_concern_supported.rb
 - lib/mongo/operation/update.rb
@@ -431,6 +433,7 @@ files:
 - mongo.gemspec
 - spec/README.md
 - spec/atlas/atlas_connectivity_spec.rb
+- spec/atlas/operations_spec.rb
 - spec/enterprise_auth/kerberos_spec.rb
 - spec/integration/auth_spec.rb
 - spec/integration/bulk_insert_spec.rb
@@ -438,6 +441,7 @@ files:
 - spec/integration/change_stream_spec.rb
 - spec/integration/client_connectivity_spec.rb
 - spec/integration/client_construction_spec.rb
+- spec/integration/client_spec.rb
 - spec/integration/command_monitoring_spec.rb
 - spec/integration/command_spec.rb
 - spec/integration/connect_single_rs_name_spec.rb
@@ -446,14 +450,18 @@ files:
 - spec/integration/docs_examples_spec.rb
 - spec/integration/error_detection_spec.rb
 - spec/integration/heartbeat_events_spec.rb
+- spec/integration/mmapv1_spec.rb
+- spec/integration/mongos_pinning_spec.rb
 - spec/integration/operation_failure_code_spec.rb
-- spec/integration/read_concern.rb
+- spec/integration/read_concern_spec.rb
+- spec/integration/read_preference_spec.rb
 - spec/integration/reconnect_spec.rb
 - spec/integration/retryable_writes_spec.rb
 - spec/integration/sdam_error_handling_spec.rb
 - spec/integration/sdam_events_spec.rb
 - spec/integration/server_description_spec.rb
 - spec/integration/server_selector_spec.rb
+- spec/integration/server_spec.rb
 - spec/integration/shell_examples_spec.rb
 - spec/integration/ssl_uri_options_spec.rb
 - spec/integration/step_down_spec.rb
@@ -493,6 +501,7 @@ files:
 - spec/mongo/cluster/topology/unknown_spec.rb
 - spec/mongo/cluster/topology_spec.rb
 - spec/mongo/cluster_spec.rb
+- spec/mongo/cluster_time_spec.rb
 - spec/mongo/collection/view/aggregation_spec.rb
 - spec/mongo/collection/view/builder/find_command_spec.rb
 - spec/mongo/collection/view/builder/flags_spec.rb
@@ -675,12 +684,15 @@ files:
 - spec/spec_tests/data/crud/read/aggregate-out.yml
 - spec/spec_tests/data/crud/read/aggregate.yml
 - spec/spec_tests/data/crud/read/count-collation.yml
+- spec/spec_tests/data/crud/read/count-empty.yml
 - spec/spec_tests/data/crud/read/count.yml
 - spec/spec_tests/data/crud/read/distinct-collation.yml
 - spec/spec_tests/data/crud/read/distinct.yml
 - spec/spec_tests/data/crud/read/find-collation.yml
 - spec/spec_tests/data/crud/read/find.yml
 - spec/spec_tests/data/crud/write/bulkWrite-arrayFilters.yml
+- spec/spec_tests/data/crud/write/bulkWrite-collation.yml
+- spec/spec_tests/data/crud/write/bulkWrite.yml
 - spec/spec_tests/data/crud/write/deleteMany-collation.yml
 - spec/spec_tests/data/crud/write/deleteMany.yml
 - spec/spec_tests/data/crud/write/deleteOne-collation.yml
@@ -708,6 +720,11 @@ files:
 - spec/spec_tests/data/crud/write/updateOne-collation.yml
 - spec/spec_tests/data/crud/write/updateOne-pre_2.6.yml
 - spec/spec_tests/data/crud/write/updateOne.yml
+- spec/spec_tests/data/crud_v2/aggregate-merge.yml
+- spec/spec_tests/data/crud_v2/aggregate-out-readConcern.yml
+- spec/spec_tests/data/crud_v2/bulkWrite-arrayFilters.yml
+- spec/spec_tests/data/crud_v2/db-aggregate.yml
+- spec/spec_tests/data/crud_v2/updateWithPipelines.yml
 - spec/spec_tests/data/dns_seedlist_discovery/longer-parent-in-return.yml
 - spec/spec_tests/data/dns_seedlist_discovery/misformatted-option.yml
 - spec/spec_tests/data/dns_seedlist_discovery/no-results.yml
@@ -964,12 +981,16 @@ files:
 - spec/spec_tests/data/transactions/count.yml
 - spec/spec_tests/data/transactions/delete.yml
 - spec/spec_tests/data/transactions/error-labels.yml
+- spec/spec_tests/data/transactions/errors-client.yml
 - spec/spec_tests/data/transactions/errors.yml
 - spec/spec_tests/data/transactions/findOneAndDelete.yml
 - spec/spec_tests/data/transactions/findOneAndReplace.yml
 - spec/spec_tests/data/transactions/findOneAndUpdate.yml
 - spec/spec_tests/data/transactions/insert.yml
 - spec/spec_tests/data/transactions/isolation.yml
+- spec/spec_tests/data/transactions/mongos-pin-auto.yml
+- spec/spec_tests/data/transactions/mongos-recovery-token.yml
+- spec/spec_tests/data/transactions/pin-mongos.yml
 - spec/spec_tests/data/transactions/read-concern.yml
 - spec/spec_tests/data/transactions/read-pref.yml
 - spec/spec_tests/data/transactions/reads.yml
@@ -1043,14 +1064,14 @@ files:
 - spec/support/connection_string.rb
 - spec/support/constraints.rb
 - spec/support/crud.rb
+- spec/support/crud/context.rb
 - spec/support/crud/operation.rb
 - spec/support/crud/outcome.rb
-- spec/support/crud/read.rb
 - spec/support/crud/requirement.rb
 - spec/support/crud/spec.rb
 - spec/support/crud/test.rb
+- spec/support/crud/test_base.rb
 - spec/support/crud/verifier.rb
-- spec/support/crud/write.rb
 - spec/support/event_subscriber.rb
 - spec/support/gridfs.rb
 - spec/support/json_ext_formatter.rb
@@ -1069,6 +1090,7 @@ files:
 - spec/support/spec_config.rb
 - spec/support/spec_setup.rb
 - spec/support/transactions.rb
+- spec/support/transactions/context.rb
 - spec/support/transactions/operation.rb
 - spec/support/transactions/spec.rb
 - spec/support/transactions/test.rb
@@ -1088,9 +1110,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
@@ -1136,14 +1158,14 @@ test_files:
 - spec/support/shared/session.rb
 - spec/support/cmap.rb
 - spec/support/authorization.rb
-- spec/support/crud/read.rb
 - spec/support/crud/spec.rb
+- spec/support/crud/test_base.rb
+- spec/support/crud/context.rb
 - spec/support/crud/operation.rb
 - spec/support/crud/test.rb
 - spec/support/crud/verifier.rb
 - spec/support/crud/requirement.rb
 - spec/support/crud/outcome.rb
-- spec/support/crud/write.rb
 - spec/support/common_shortcuts.rb
 - spec/support/monitoring_ext.rb
 - spec/support/client_registry_macros.rb
@@ -1158,6 +1180,7 @@ test_files:
 - spec/support/transactions.rb
 - spec/support/cluster_tools.rb
 - spec/support/transactions/spec.rb
+- spec/support/transactions/context.rb
 - spec/support/transactions/operation.rb
 - spec/support/transactions/test.rb
 - spec/support/spec_setup.rb
@@ -1165,21 +1188,25 @@ test_files:
 - spec/README.md
 - spec/integration/ssl_uri_options_spec.rb
 - spec/integration/step_down_spec.rb
-- spec/integration/read_concern.rb
+- spec/integration/read_concern_spec.rb
 - spec/integration/server_description_spec.rb
 - spec/integration/connection_spec.rb
 - spec/integration/operation_failure_code_spec.rb
 - spec/integration/error_detection_spec.rb
 - spec/integration/connect_single_rs_name_spec.rb
+- spec/integration/mmapv1_spec.rb
 - spec/integration/sdam_events_spec.rb
 - spec/integration/shell_examples_spec.rb
 - spec/integration/cursor_reaping_spec.rb
+- spec/integration/client_spec.rb
+- spec/integration/server_spec.rb
 - spec/integration/client_construction_spec.rb
 - spec/integration/server_selector_spec.rb
 - spec/integration/retryable_writes_spec.rb
 - spec/integration/change_stream_examples_spec.rb
 - spec/integration/transactions_examples_spec.rb
 - spec/integration/command_monitoring_spec.rb
+- spec/integration/read_preference_spec.rb
 - spec/integration/reconnect_spec.rb
 - spec/integration/client_connectivity_spec.rb
 - spec/integration/bulk_insert_spec.rb
@@ -1187,6 +1214,7 @@ test_files:
 - spec/integration/command_spec.rb
 - spec/integration/change_stream_spec.rb
 - spec/integration/time_zone_querying_spec.rb
+- spec/integration/mongos_pinning_spec.rb
 - spec/integration/heartbeat_events_spec.rb
 - spec/integration/docs_examples_spec.rb
 - spec/integration/sdam_error_handling_spec.rb
@@ -1227,6 +1255,7 @@ test_files:
 - spec/mongo/uri_option_parsing_spec.rb
 - spec/mongo/lint_spec.rb
 - spec/mongo/dbref_spec.rb
+- spec/mongo/cluster_time_spec.rb
 - spec/mongo/options/redacted_spec.rb
 - spec/mongo/client_spec.rb
 - spec/mongo/server_spec.rb
@@ -1356,6 +1385,7 @@ test_files:
 - spec/mongo/event/publisher_spec.rb
 - spec/mongo/event/subscriber_spec.rb
 - spec/mongo/uri/srv_protocol_spec.rb
+- spec/atlas/operations_spec.rb
 - spec/atlas/atlas_connectivity_spec.rb
 - spec/enterprise_auth/kerberos_spec.rb
 - spec/lite_spec_helper.rb
@@ -1519,14 +1549,21 @@ test_files:
 - spec/spec_tests/data/uri_options/connection-pool-options.yml
 - spec/spec_tests/data/uri_options/read-preference-options.yml
 - spec/spec_tests/data/uri_options/concern-options.yml
+- spec/spec_tests/data/crud_v2/bulkWrite-arrayFilters.yml
+- spec/spec_tests/data/crud_v2/updateWithPipelines.yml
+- spec/spec_tests/data/crud_v2/aggregate-merge.yml
+- spec/spec_tests/data/crud_v2/db-aggregate.yml
+- spec/spec_tests/data/crud_v2/aggregate-out-readConcern.yml
 - spec/spec_tests/data/crud/write/findOneAndUpdate-collation.yml
 - spec/spec_tests/data/crud/write/findOneAndReplace-upsert.yml
 - spec/spec_tests/data/crud/write/findOneAndDelete.yml
+- spec/spec_tests/data/crud/write/bulkWrite-collation.yml
 - spec/spec_tests/data/crud/write/deleteMany.yml
 - spec/spec_tests/data/crud/write/deleteOne-collation.yml
 - spec/spec_tests/data/crud/write/replaceOne-pre_2.6.yml
 - spec/spec_tests/data/crud/write/deleteMany-collation.yml
 - spec/spec_tests/data/crud/write/findOneAndDelete-collation.yml
+- spec/spec_tests/data/crud/write/bulkWrite.yml
 - spec/spec_tests/data/crud/write/updateOne.yml
 - spec/spec_tests/data/crud/write/bulkWrite-arrayFilters.yml
 - spec/spec_tests/data/crud/write/updateMany-arrayFilters.yml
@@ -1551,6 +1588,7 @@ test_files:
 - spec/spec_tests/data/crud/read/distinct-collation.yml
 - spec/spec_tests/data/crud/read/find.yml
 - spec/spec_tests/data/crud/read/count.yml
+- spec/spec_tests/data/crud/read/count-empty.yml
 - spec/spec_tests/data/crud/read/aggregate-out.yml
 - spec/spec_tests/data/crud/read/find-collation.yml
 - spec/spec_tests/data/crud/read/aggregate.yml
@@ -1706,12 +1744,15 @@ test_files:
 - spec/spec_tests/data/transactions/isolation.yml
 - spec/spec_tests/data/transactions/transaction-options.yml
 - spec/spec_tests/data/transactions/write-concern.yml
+- spec/spec_tests/data/transactions/errors-client.yml
 - spec/spec_tests/data/transactions/read-pref.yml
 - spec/spec_tests/data/transactions/findOneAndDelete.yml
+- spec/spec_tests/data/transactions/mongos-pin-auto.yml
 - spec/spec_tests/data/transactions/error-labels.yml
 - spec/spec_tests/data/transactions/retryable-commit.yml
 - spec/spec_tests/data/transactions/read-concern.yml
 - spec/spec_tests/data/transactions/bulk.yml
+- spec/spec_tests/data/transactions/pin-mongos.yml
 - spec/spec_tests/data/transactions/reads.yml
 - spec/spec_tests/data/transactions/count.yml
 - spec/spec_tests/data/transactions/findOneAndReplace.yml
@@ -1723,6 +1764,7 @@ test_files:
 - spec/spec_tests/data/transactions/causal-consistency.yml
 - spec/spec_tests/data/transactions/run-command.yml
 - spec/spec_tests/data/transactions/delete.yml
+- spec/spec_tests/data/transactions/mongos-recovery-token.yml
 - spec/spec_tests/data/transactions/commit.yml
 - spec/spec_tests/crud_spec.rb
 - spec/spec_tests/max_staleness_spec.rb