mongo 2.12.0.rc0 → 2.12.1

data/spec/mongo/srv/monitor_spec.rb

@@ -1,82 +1,101 @@
 require 'lite_spec_helper'
 
-describe Mongo::SRV::Monitor do
+describe Mongo::Srv::Monitor do
   describe '#scan!' do
     let(:hostname) do
-      'test1.test.build.10gen.cc.'
+      'test1.test.build.10gen.cc'
     end
 
     let(:hosts) do
       [
-        'localhost.test.build.10gen.cc.:27017',
-        'localhost.test.build.10gen.cc.:27018',
+        'localhost.test.build.10gen.cc:27017',
+        'localhost.test.build.10gen.cc:27018',
       ]
     end
 
-    let(:records) do
-      double('records').tap do |records|
-        allow(records).to receive(:hostname).and_return(hostname)
-        allow(records).to receive(:hosts).and_return(hosts)
-        allow(records).to receive(:empty?).and_return(false)
-        allow(records).to receive(:min_ttl).and_return(nil)
+    let(:result) do
+      double('result').tap do |result|
+        allow(result).to receive(:hostname).and_return(hostname)
+        allow(result).to receive(:address_strs).and_return(hosts)
+        allow(result).to receive(:empty?).and_return(false)
+        allow(result).to receive(:min_ttl).and_return(nil)
       end
     end
 
+    let(:uri_resolver) do
+      double('uri resolver').tap do |resolver|
+        expect(resolver).to receive(:get_records).and_return(result)
+      end
+    end
+
+    let(:srv_uri) do
+      Mongo::URI.get("mongodb+srv://this.is.not.used")
+    end
 
     let(:cluster) do
-      Mongo::Cluster.new(records.hosts, Mongo::Monitoring.new, { monitoring_io: false })
+      Mongo::Cluster.new(hosts, Mongo::Monitoring.new, monitoring_io: false)
     end
 
-    let(:monitoring) do
-      described_class.new(cluster, resolver, records)
+    let(:monitor) do
+      described_class.new(cluster, srv_uri: srv_uri)
     end
 
     before do
-      monitoring.scan!
+      # monitor instantiation triggers cluster instantiation which
+      # performs real SRV lookups for the hostname.
+      # The next lookup (the one performed when cluster is already set up)
+      # is using our doubles.
+      RSpec::Mocks.with_temporary_scope do
+        allow(uri_resolver).to receive(:get_txt_options_string)
+        expect(Mongo::Srv::Resolver).to receive(:new).ordered.and_return(uri_resolver)
+        allow(resolver).to receive(:get_txt_options_string)
+        expect(Mongo::Srv::Resolver).to receive(:new).ordered.and_return(resolver)
+        monitor.send(:scan!)
+      end
     end
 
     context 'when a new DNS record is added' do
       let(:new_hosts) do
-        hosts + ['test1.test.build.10gen.cc.:27019']
+        hosts + ['localhost.test.build.10gen.cc:27019']
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
-        double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+        double('monitor resolver').tap do |resolver|
+          expect(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
       it 'adds the new host to the cluster' do
-        expect(cluster.addresses.map(&:to_s).sort).to eq(new_hosts.sort)
+        expect(cluster.servers_list.map(&:address).map(&:to_s).sort).to eq(new_hosts.sort)
       end
     end
 
     context 'when a DNS record is removed' do
       let(:new_hosts) do
-        hosts - ['test1.test.build.10gen.cc.:27018']
+        hosts - ['test1.test.build.10gen.cc:27018']
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          allow(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -87,21 +106,21 @@ describe Mongo::SRV::Monitor do
 
     context 'when a single DNS record is replaced' do
       let(:new_hosts) do
-        hosts - ['test1.test.build.10gen.cc.:27018'] +  ['test1.test.build.10gen.cc.:27019']
+        hosts - ['test1.test.build.10gen.cc:27018'] +  ['test1.test.build.10gen.cc:27019']
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          allow(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -110,23 +129,23 @@ describe Mongo::SRV::Monitor do
       end
     end
 
-    context 'when all DNS records are replaced with a single record' do
+    context 'when all DNS result are replaced with a single record' do
       let(:new_hosts) do
-        ['test1.test.build.10gen.cc.:27019']
+        ['test1.test.build.10gen.cc:27019']
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          expect(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -135,26 +154,26 @@ describe Mongo::SRV::Monitor do
       end
     end
 
-    context 'when all DNS records are replaced with multiple records' do
+    context 'when all DNS result are replaced with multiple result' do
       let(:new_hosts) do
         [
-          'test1.test.build.10gen.cc.:27019',
-          'test1.test.build.10gen.cc.:27020',
+          'test1.test.build.10gen.cc:27019',
+          'test1.test.build.10gen.cc:27020',
         ]
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          allow(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -166,7 +185,7 @@ describe Mongo::SRV::Monitor do
     context 'when the DNS lookup times out' do
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_raise(Resolv::ResolvTimeout)
+          expect(resolver).to receive(:get_records).and_raise(Resolv::ResolvTimeout)
         end
       end
 
@@ -187,19 +206,19 @@ describe Mongo::SRV::Monitor do
       end
     end
 
-    context 'when no DNS records are returned' do
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return([])
-          allow(records).to receive(:empty?).and_return(true)
-          allow(records).to receive(:min_ttl).and_return(nil)
+    context 'when no DNS result are returned' do
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return([])
+          allow(result).to receive(:empty?).and_return(true)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          allow(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -208,4 +227,4 @@ describe Mongo::SRV::Monitor do
       end
     end
   end
-end
+end

data/spec/runners/transactions.rb

@@ -30,14 +30,12 @@ def define_transactions_spec_tests(test_paths)
         spec.tests.each do |test|
 
           before do
-            if test.multiple_mongoses?
-              if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length == 1
+            if ClusterConfig.instance.topology == :sharded
+              if test.multiple_mongoses? && SpecConfig.instance.addresses.length == 1
                 skip "Test requires multiple mongoses"
-              end
-            else
-              # Many transaction spec tests that do not specifically deal with
-              # sharded transactions fail when run against a multi-mongos cluster
-              if SpecConfig.instance.addresses.length > 1
+              elsif !test.multiple_mongoses? && 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 does not specify multiple mongoses"
               end
             end

data/spec/spec_tests/client_side_encryption_spec.rb

@@ -4,10 +4,5 @@ describe 'Client-Side Encryption' do
   require_libmongocrypt
   require_enterprise
 
-  before do
-    unless ClusterConfig.instance.single_server?
-      skip "SPEC-2147: tests only work on single server"
-    end
-  end
   define_transactions_spec_tests(CLIENT_SIDE_ENCRYPTION_TESTS)
 end

data/spec/spec_tests/data/client_side_encryption/bulk.yml

@@ -68,6 +68,9 @@ tests:
             updates:
               - q: { encrypted_string: { $eq: {'$binary': {'base64': 'AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==', 'subType': '06'}} }}
                 u: {$set: { encrypted_string: {'$binary': {'base64': 'AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==', 'subType': '06'}} }}
+                # DRIVERS-976: mongocryptd adds upsert and multi fields to all update commands, so these fields should be added to spec tests
+                upsert: false
+                multi: false
             ordered: true
           command_name: update
       - command_started_event:

data/spec/spec_tests/data/client_side_encryption/replaceOne.yml

@@ -52,10 +52,13 @@ tests:
             updates:
               - q: { encrypted_string: { $eq: {'$binary': {'base64': 'AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==', 'subType': '06'}} } }
                 u: { encrypted_string: {'$binary': {'base64': 'AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==', 'subType': '06'}}, random: { $$type: "binData" } }
+                # DRIVERS-976: mongocryptd adds upsert and multi fields to all update commands, so these fields should be added to spec tests
+                upsert: false
+                multi: false
             ordered: true
           command_name: update
     outcome:
       collection:
         # Outcome is checked using a separate MongoClient without auto encryption.
         data:
-          - { _id: 1, encrypted_string: {'$binary': {'base64': 'AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==', 'subType': '06'}}, random: { $$type: "binData" } }
+          - { _id: 1, encrypted_string: {'$binary': {'base64': 'AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==', 'subType': '06'}}, random: { $$type: "binData" } }

data/spec/spec_tests/data/client_side_encryption/updateOne.yml

@@ -52,6 +52,9 @@ tests:
             updates:
               - q: { encrypted_string: { $eq: {'$binary': {'base64': 'AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==', 'subType': '06'}} } }
                 u: { $set: {encrypted_string: {'$binary': {'base64': 'AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==', 'subType': '06'}}, random: { $$type: "binData" } } }
+                # DRIVERS-976: mongocryptd adds upsert and multi fields to all update commands, so these fields should be added to spec tests
+                upsert: false
+                multi: false
             ordered: true
           command_name: update
     outcome:

data/spec/support/cluster_tools.rb

@@ -304,7 +304,12 @@ class ClusterTools
   def set_rs_config(config)
     config = config.dup
     config['version'] += 1
-    result = admin_client.database.command(replSetReconfig: config)
+    cmd = {replSetReconfig: config}
+    if ClusterConfig.instance.fcv_ish >= '4.4'
+      # Workaround for https://jira.mongodb.org/browse/SERVER-46894
+      cmd[:force] = true
+    end
+    result = admin_client.database.command(cmd)
     doc = result.reply.documents.first
     if doc['ok'] != 1
       raise 'Failed to reconfigure RS'

data/spec/support/crypt.rb

@@ -52,6 +52,20 @@ module Crypt
 
     # Example value to encrypt
     let(:ssn) { '123-456-7890' }
+
+    let(:key_vault_collection) do
+      authorized_client.with(
+        database: key_vault_db,
+        write_concern: { w: :majority }
+      )[key_vault_coll]
+    end
+
+    let(:extra_options) do
+      {
+        mongocryptd_spawn_args: ["--port=#{SpecConfig.instance.mongocryptd_port}"],
+        mongocryptd_uri: "mongodb://localhost:#{SpecConfig.instance.mongocryptd_port}",
+      }
+    end
   end
 
   # For tests that require local KMS to be configured

data/spec/support/lite_constraints.rb

@@ -47,7 +47,9 @@ module LiteConstraints
 
   def require_mongo_kerberos
     before(:all) do
-      skip 'KERBEROS env var not specified' unless ENV['KERBEROS']
+      unless %w(1 yes true).include?(ENV['MONGO_RUBY_DRIVER_KERBEROS']&.downcase)
+        skip 'Set MONGO_RUBY_DRIVER_KERBEROS=1 in environment to run Kerberos unit tests'
+      end
       require 'mongo_kerberos'
     end
   end

data/spec/support/spec_config.rb

@@ -328,6 +328,16 @@ EOT
     ENV['MONGO_RUBY_DRIVER_AWS_ARN']
   end
 
+  def mongocryptd_port
+    if ENV['MONGO_RUBY_DRIVER_MONGOCRYPTD_PORT'] &&
+      !ENV['MONGO_RUBY_DRIVER_MONGOCRYPTD_PORT'].empty?
+    then
+      ENV['MONGO_RUBY_DRIVER_MONGOCRYPTD_PORT'].to_i
+    else
+      27020
+    end
+  end
+
   # Option hashes
 
   def auth_options

data/spec/support/utils.rb

@@ -89,6 +89,13 @@ module Utils
       if name == 'autoEncryptOpts'
         opts.merge!(
           auto_encryption_options: convert_auto_encryption_client_options(value)
+            .merge(
+              # Spawn mongocryptd on non-default port for sharded cluster tests
+              extra_options: {
+                mongocryptd_spawn_args: ["--port=#{SpecConfig.instance.mongocryptd_port}"],
+                mongocryptd_uri: "mongodb://localhost:#{SpecConfig.instance.mongocryptd_port}",
+              }
+            )
         )
       else
         uri.send(:add_uri_option, name, value.to_s, opts)
@@ -329,7 +336,8 @@ module Utils
 
       actual.is_a?(expected_class) || actual.key?(expected_key)
     elsif expected.is_a?(Hash) && actual.is_a?(Hash)
-      same_keys = (expected.keys - actual.keys).empty?
+      same_keys = (expected.keys - actual.keys).empty? &&
+        (actual.keys - expected.keys).empty?
 
       same_values = expected.keys.all? do |key|
         match_with_type?(expected[key], actual[key])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.12.0.rc0
+  version: 2.12.1
 platform: ruby
 authors:
 - Tyler Brock
@@ -31,7 +31,7 @@ cert_chain:
   gpvfPNWMwyBDlHaNS3GfO6cRRxBOvEG05GUCsvtTY4Bpe8yjE64wg1ymb47LMOnv
   Qb1lGORmf/opg45mluKUYl7pQNZHD0d3
   -----END CERTIFICATE-----
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 description: A Ruby driver for MongoDB
-email: mongodb-dev@googlegroups.com
+email: 
 executables:
 - mongo_console
 extensions: []
@@ -107,7 +107,6 @@ files:
 - lib/mongo/cluster/reapers/cursor_reaper.rb
 - lib/mongo/cluster/reapers/socket_reaper.rb
 - lib/mongo/cluster/sdam_flow.rb
-- lib/mongo/cluster/srv_monitor.rb
 - lib/mongo/cluster/topology.rb
 - lib/mongo/cluster/topology/base.rb
 - lib/mongo/cluster/topology/no_replica_set_options.rb
@@ -457,7 +456,6 @@ files:
 - lib/mongo/srv/monitor.rb
 - lib/mongo/srv/resolver.rb
 - lib/mongo/srv/result.rb
-- lib/mongo/srv/warning_result.rb
 - lib/mongo/timeout.rb
 - lib/mongo/uri.rb
 - lib/mongo/uri/srv_protocol.rb
@@ -471,7 +469,6 @@ files:
 - spec/USERS.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/bson_symbol_spec.rb
 - spec/integration/bulk_insert_spec.rb
@@ -530,6 +527,7 @@ files:
 - spec/integration/step_down_spec.rb
 - spec/integration/time_zone_querying_spec.rb
 - spec/integration/transactions_examples_spec.rb
+- spec/kerberos/kerberos_spec.rb
 - spec/lite_spec_helper.rb
 - spec/mongo/address/ipv4_spec.rb
 - spec/mongo/address/ipv6_spec.rb
@@ -561,7 +559,6 @@ files:
 - spec/mongo/cluster/cursor_reaper_spec.rb
 - spec/mongo/cluster/periodic_executor_spec.rb
 - spec/mongo/cluster/socket_reaper_spec.rb
-- spec/mongo/cluster/srv_monitor_spec.rb
 - spec/mongo/cluster/topology/replica_set_spec.rb
 - spec/mongo/cluster/topology/sharded_spec.rb
 - spec/mongo/cluster/topology/single_spec.rb
@@ -606,9 +603,11 @@ files:
 - spec/mongo/cursor_spec.rb
 - spec/mongo/database_spec.rb
 - spec/mongo/dbref_spec.rb
+- spec/mongo/error/bulk_write_error_spec.rb
 - spec/mongo/error/crypt_error_spec.rb
 - spec/mongo/error/max_bson_size_spec.rb
 - spec/mongo/error/no_server_available_spec.rb
+- spec/mongo/error/notable_spec.rb
 - spec/mongo/error/operation_failure_spec.rb
 - spec/mongo/error/parser_spec.rb
 - spec/mongo/event/publisher_spec.rb
@@ -670,7 +669,8 @@ files:
 - spec/mongo/operation/kill_cursors_spec.rb
 - spec/mongo/operation/limited_spec.rb
 - spec/mongo/operation/map_reduce_spec.rb
-- spec/mongo/operation/read_preference_spec.rb
+- spec/mongo/operation/read_preference_legacy_spec.rb
+- spec/mongo/operation/read_preference_op_msg_spec.rb
 - spec/mongo/operation/remove_user_spec.rb
 - spec/mongo/operation/result_spec.rb
 - spec/mongo/operation/specifiable_spec.rb
@@ -1273,7 +1273,6 @@ metadata:
   changelog_uri: https://github.com/mongodb/mongo-ruby-driver/releases
   documentation_uri: https://docs.mongodb.com/ruby-driver/
   homepage_uri: https://docs.mongodb.com/ruby-driver/
-  mailing_list_uri: https://groups.google.com/group/mongodb-user
   source_code_uri: https://github.com/mongodb/mongo-ruby-driver
 post_install_message: 
 rdoc_options: []
@@ -1286,15 +1285,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
 test_files:
+- spec/kerberos/kerberos_spec.rb
 - spec/spec_helper.rb
 - spec/integration/read_preference_spec.rb
 - spec/integration/sdam_events_spec.rb
@@ -1356,7 +1356,6 @@ test_files:
 - spec/integration/server_selector_spec.rb
 - spec/lite_spec_helper.rb
 - spec/README.md
-- spec/enterprise_auth/kerberos_spec.rb
 - spec/USERS.md
 - spec/support/client_registry_macros.rb
 - spec/support/common_shortcuts.rb
@@ -1422,7 +1421,6 @@ test_files:
 - spec/support/event_subscriber.rb
 - spec/support/crypt.rb
 - spec/support/cluster_config.rb
-- spec/mongo/operation/read_preference_spec.rb
 - spec/mongo/operation/collections_info_spec.rb
 - spec/mongo/operation/delete_spec.rb
 - spec/mongo/operation/drop_index_spec.rb
@@ -1441,9 +1439,11 @@ test_files:
 - spec/mongo/operation/create_index_spec.rb
 - spec/mongo/operation/update_spec.rb
 - spec/mongo/operation/remove_user_spec.rb
+- spec/mongo/operation/read_preference_legacy_spec.rb
 - spec/mongo/operation/specifiable_spec.rb
 - spec/mongo/operation/result_spec.rb
 - spec/mongo/operation/command_spec.rb
+- spec/mongo/operation/read_preference_op_msg_spec.rb
 - spec/mongo/operation/get_more_spec.rb
 - spec/mongo/operation/insert_spec.rb
 - spec/mongo/operation/limited_spec.rb
@@ -1464,7 +1464,6 @@ test_files:
 - spec/mongo/cluster/topology/unknown_spec.rb
 - spec/mongo/cluster/cursor_reaper_spec.rb
 - spec/mongo/cluster/periodic_executor_spec.rb
-- spec/mongo/cluster/srv_monitor_spec.rb
 - spec/mongo/cluster/topology_spec.rb
 - spec/mongo/cluster/socket_reaper_spec.rb
 - spec/mongo/server_selector/primary_preferred_spec.rb
@@ -1593,6 +1592,8 @@ test_files:
 - spec/mongo/monitoring/event/topology_closed_spec.rb
 - spec/mongo/uri/srv_protocol_spec.rb
 - spec/mongo/error/no_server_available_spec.rb
+- spec/mongo/error/bulk_write_error_spec.rb
+- spec/mongo/error/notable_spec.rb
 - spec/mongo/error/parser_spec.rb
 - spec/mongo/error/max_bson_size_spec.rb
 - spec/mongo/error/crypt_error_spec.rb