mongo 2.18.2 → 2.19.3

data/spec/shared/share/Dockerfile.erb

@@ -7,13 +7,13 @@
 <%
 
 python_toolchain_url = "https://s3.amazonaws.com//mciuploads/mongo-python-driver-toolchain/#{distro}/ba92de2700c04ee2d4f82c3ffdfc33105140cb04/mongo_python_driver_toolchain_#{distro.gsub('-', '_')}_ba92de2700c04ee2d4f82c3ffdfc33105140cb04_19_11_14_15_33_33.tar.gz"
-server_version = '4.3.3'
+# server_version = '4.3.3'
 server_url = "http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-#{distro}-#{server_version}.tgz"
 server_archive_basename = File.basename(server_url)
 server_extracted_dir = server_archive_basename.sub(/\.(tar\.gz|tgz)$/, '')
 
 # When changing, also update the hash in shlib/set_env.sh.
-TOOLCHAIN_VERSION='219833abad4d9d3bf43c0fef101a8ca082ac4ae9'
+TOOLCHAIN_VERSION='e8c60866f54bed7e336a37df3a97d6ae1b971b7d'
 
 def ruby_toolchain_url(ruby)
   "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/#{TOOLCHAIN_VERSION}/#{distro}/#{ruby}.tar.xz"
@@ -77,12 +77,12 @@ ENV DOCKER=1
   # therefore install python-pip in all configurations here.
 
   <% packages = %w(
-    procps lsb-release bzip2 curl zsh
+    procps lsb-release bzip2 curl wget gpg zsh
     git make gcc libyaml-0-2 libgmp-dev zlib1g-dev libsnappy-dev
     krb5-user krb5-kdc krb5-admin-server libsasl2-dev libsasl2-modules-gssapi-mit
     haproxy
     python3-pip
-    tzdata shared-mime-info
+    tzdata shared-mime-info software-properties-common
   ) %>
 
   <% if distro =~ /ubuntu2004/ %>
@@ -120,16 +120,22 @@ ENV DOCKER=1
   <% end %>
 
   RUN apt-get update && apt-get install -y <%= packages.join(' ') %>
-  
+
+  <% if ubuntu? %>
+    RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+    RUN echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+  <% end %>
+  RUN apt-get update && apt-get install -y cmake
+
 <% else %>
 
   <% if distro =~ /rhel6/ %>
-  
+
     # CentOS 6 is dead - to use it retrieve the packages from vault:
     # https://stackoverflow.com/questions/53562691/error-cannot-retrieve-repository-metadata-repomd-xml-for-repository-base-pl
-  
+
     <%
-      
+
       cfg = <<-CFG
 [base]
 name=CentOS-$releasever - Base
@@ -141,11 +147,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
 CFG
 
     %>
-  
+
     RUN printf "<%= cfg.gsub("\n", "\\n") %>" >/etc/yum.repos.d/CentOS-Base.repo
-  
+
   <% end %>
-  
+
   # Enterprise server: net-snmp
   # lsb_release: redhat-lsb-core
   # our runner scripts: which
@@ -162,7 +168,7 @@ CFG
 
   RUN yum install -y redhat-lsb-core which git gcc libyaml krb5-server \
     krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-1.8.0-openjdk \
-    net-snmp python3
+    net-snmp python3 cmake
 
   <% if distro =~ /rhel6/ %>
 
@@ -178,7 +184,7 @@ CFG
     RUN yum install -y python-devel
 
   <% end %>
-  
+
 <% end %>
 
 <% if preload? %>
@@ -220,7 +226,7 @@ CFG
   <% when 'git' %>
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     RUN python3 -m pip install virtualenv 'pymongo>=4' python-dateutil psutil
-    
+
     # Install mtools from git because released versions do not work with pymongo 4.0
     RUN git clone https://github.com/p-mongodb/mtools && \
       cd mtools && \
@@ -243,7 +249,7 @@ CFG
     # boto3~=1.19 cryptography~=3.4.8 pykmip~=0.10.0
     # cryptography does not install due to lacking setuptools_rust
     # (either that version or anything that isn't part of system packages)
-    RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0
+    RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0 'sqlalchemy<2.0.0'
   <% end %>
 
   <% unless ruby_head? || system_ruby? %>
@@ -255,10 +261,6 @@ CFG
 
   <% end %>
 
-  RUN curl --retry 3 -fL <%= server_download_url %> |tar xzf - && \
-    mv mongo*/ /opt/mongodb
-  ENV USE_OPT_MONGODB=1 USE_SYSTEM_PYTHON_PACKAGES=1
-
 <% end %>
 
 <% if distro =~ /debian|ubuntu/ %>
@@ -308,6 +310,9 @@ ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
 
 COPY . .
 
+RUN bash -c '. .evergreen/download-mongodb.sh && get_distro && get_mongodb_download_url_for "$DISTRO" "<%= server_version %>" && curl --retry 3 -fL $MONGODB_DOWNLOAD_URL |tar xzf - && mv mongo*/ /opt/mongodb'
+ENV USE_OPT_MONGODB=1 USE_SYSTEM_PYTHON_PACKAGES=1
+
 <% if expose? %>
 
   <% ports = [] %>

data/spec/shared/shlib/server.sh

@@ -71,12 +71,18 @@ prepare_server_from_url() {
   export PATH="$BINDIR":$PATH
 }
 
-install_mlaunch_virtualenv() {
+install_mlaunch_venv() {
   python3 -V || true
-  if ! python3 -m virtualenv -h >/dev/null; then
+  if ! python3 -m venv -h >/dev/null; then
     # Current virtualenv fails with
     # https://github.com/pypa/virtualenv/issues/1630
-    python3 -m pip install 'virtualenv<20' --user
+    python3 -m pip install venv --user
+  fi
+  if ! python3 -m ensurepip -h > /dev/null; then
+    # Debian11/Ubuntu2204 have venv installed, but it is nonfunctional unless
+    # the python3-venv package is also installed (it lacks the ensurepip
+    # module).
+    sudo apt-get install --yes python3-venv
   fi
   if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
     python3 -m pip list |grep mtools
@@ -84,14 +90,19 @@ install_mlaunch_virtualenv() {
     # Use the existing mtools-legacy
     :
   else
-    venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-    python3 -m virtualenv -p python3 $venvpath
-    . $venvpath/bin/activate
+    # Spawn a virtual environment, but only if one is not already
+    # active...
+    if test -z "$VIRTUAL_ENV"; then
+      venvpath="$MONGO_ORCHESTRATION_HOME"/venv
+      python3 -m venv $venvpath
+      . $venvpath/bin/activate
+    fi
+
     # [mlaunch] does not work:
     # https://github.com/rueckstiess/mtools/issues/856
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     #pip install 'mtools==1.7' 'pymongo==4.1' python-dateutil psutil
-    
+
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi
@@ -158,6 +169,19 @@ install_mlaunch_git() {
   fi
 }
 
+install_cmake() {
+  if ! command -v cmake &> /dev/null; then
+    if ! command -v apt-get &> /dev/null; then
+      # no apt-get; assume RHEL
+      sudo yum -y install cmake libarchive
+    else
+      sudo apt-get install --yes cmake
+    fi
+  else
+    echo 'cmake is present'
+  fi
+}
+
 # This function sets followong global variables:
 #   server_cert_path
 #   server_ca_path
@@ -173,7 +197,7 @@ calculate_server_args() {
   fi
 
   if test $mongo_version = latest; then
-    mongo_version=60
+    mongo_version=70
   fi
 
   local args="--setParameter enableTestCommands=1"

data/spec/shared/shlib/set_env.sh

@@ -1,5 +1,5 @@
 # When changing, also update the hash in share/Dockerfile.
-TOOLCHAIN_VERSION=219833abad4d9d3bf43c0fef101a8ca082ac4ae9
+TOOLCHAIN_VERSION=e8c60866f54bed7e336a37df3a97d6ae1b971b7d
 
 set_env_java() {
   ls -l /opt || true
@@ -53,7 +53,7 @@ set_env_python() {
       curl -fL --retry 3 https://github.com/p-mongodb/deps/raw/main/"$arch"-python37.tar.xz | \
         tar xfJ - -C /opt
     fi
-    
+
     if test -d /opt/python/3.7/bin; then
       # Most Evergreen configurations.
       export PATH=/opt/python/3.7/bin:$PATH
@@ -61,7 +61,7 @@ set_env_python() {
       # Configurations that use Docker in Evergreen - these don't preload.
       export PATH=/opt/python37/bin:$PATH
     fi
-    
+
     python3 -V
   fi
 }
@@ -78,7 +78,7 @@ set_env_node() {
     # Node from toolchain in Evergreen
     export PATH=/opt/node/bin:$PATH
   fi
-  
+
   node -v
 }
 

data/spec/solo/clean_exit_spec.rb

@@ -1,19 +1,12 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'mongo'
+require 'lite_spec_helper'
 
 describe 'Clean exit' do
-
-  before(:all) do
-    unless %w(1 true yes).include?(ENV['SOLO'])
-      skip 'Set SOLO=1 in environment to run solo tests'
-    end
-
-    if %w(1 true yes).include?(ENV['EXTERNAL_DISABLED'])
-      skip "Test requires external connectivity"
-    end
-  end
+  require_external_connectivity
+  require_solo
 
   context 'with SRV URI' do
 

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 
@@ -20,7 +20,7 @@ RSpec.configure do |config|
   config.extend(Constraints)
 
   config.before(:all) do
-    if ClusterConfig.instance.fcv_ish >= '3.6' && !SpecConfig.instance.serverless? # Serverless instances do not support killAllSessions command.
+    if SpecConfig.instance.kill_all_server_sessions?
       kill_all_server_sessions
     end
   end

data/spec/spec_tests/auth_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/spec_tests/change_streams_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -9,5 +9,6 @@ base = "#{CURRENT_PATH}/spec_tests/data/change_streams_unified"
 CHANGE_STREAM_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
 
 describe 'Change stream unified spec tests' do
+  require_no_multi_mongos
   define_unified_spec_tests(base, CHANGE_STREAM_UNIFIED_TESTS)
 end

data/spec/spec_tests/client_side_encryption_spec.rb

@@ -1,14 +1,37 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
 require 'runners/crud'
 require 'runners/transactions'
 
+SPECS_IGNORING_BSON_TYPES = %w[ fle2v2-CreateCollection.yml ]
+
+# expect bson types for all specs EXCEPT those mentioned in
+# SPECS_IGNORING_BSON_TYPES
+EXPECTATIONS_BSON_TYPES = -> (test) { !SPECS_IGNORING_BSON_TYPES.include?(test.spec.description) }
+
 describe 'Client-Side Encryption' do
   require_libmongocrypt
   require_enterprise
+  min_libmongocrypt_version '1.8.0'
+
+  context 'with mongocryptd' do
+    SpecConfig.instance.without_crypt_shared_lib_path do
+      define_transactions_spec_tests(CLIENT_SIDE_ENCRYPTION_TESTS, expectations_bson_types: EXPECTATIONS_BSON_TYPES)
+    end
+  end
+
+  context 'with crypt_shared' do
+    # Under JRuby+Evergreen, these specs complain about the crypt_shared
+    # library not loading; however, crypt_shared appears to load for other
+    # specs that require it (see the client_side_encryption_unified_spec and
+    # mongocryptd_prose_spec tests).
+    fails_on_jruby
 
-  define_transactions_spec_tests(CLIENT_SIDE_ENCRYPTION_TESTS, expectations_bson_types: false)
+    SpecConfig.instance.require_crypt_shared do
+      define_transactions_spec_tests(CLIENT_SIDE_ENCRYPTION_TESTS, expectations_bson_types: EXPECTATIONS_BSON_TYPES)
+    end
+  end
 end

data/spec/spec_tests/client_side_encryption_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -12,5 +12,15 @@ describe 'Client side encryption spec tests - unified' do
   require_libmongocrypt
   require_enterprise
 
-  define_unified_spec_tests(base, CLIENT_SIDE_ENCRYPTION_UNIFIED_TESTS)
+  context 'with mongocryptd' do
+    SpecConfig.instance.without_crypt_shared_lib_path do
+      define_unified_spec_tests(base, CLIENT_SIDE_ENCRYPTION_UNIFIED_TESTS)
+    end
+  end
+
+  context 'with crypt_shared' do
+    SpecConfig.instance.require_crypt_shared do
+      define_unified_spec_tests(base, CLIENT_SIDE_ENCRYPTION_UNIFIED_TESTS)
+    end
+  end
 end

data/spec/spec_tests/cmap_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -27,7 +27,7 @@ describe 'Cmap' do
   let(:options) do
     Mongo::Utils.shallow_symbolize_keys(Mongo::Client.canonicalize_ruby_options(
       SpecConfig.instance.all_test_options,
-    )).update(monitoring_io: false).tap do |options|
+    )).update(monitoring_io: false, populator_io: true).tap do |options|
       # We have a wait queue timeout set in the test suite options, but having
       # this option set interferes with assertions in the cmap spec tests.
       options.delete(:wait_queue_timeout)
@@ -38,6 +38,11 @@ describe 'Cmap' do
     spec = Mongo::Cmap::Spec.new(file)
 
     context("#{spec.description} (#{file.sub(%r'.*/data/cmap/', '')})") do
+      unless spec.satisfied?
+        before(:all) do
+          skip "Requirements not satisfied"
+        end
+      end
 
       before do
         subscriber = Mrss::EventSubscriber.new
@@ -54,28 +59,37 @@ describe 'Cmap' do
             options.merge(spec.pool_options)
           ).tap do |server|
             allow(server).to receive(:description).and_return(ClusterConfig.instance.primary_description)
+            # Since we use a mock for the cluster, run_sdam_flow does not clear
+            # the pool or mark the server unknown. Manually clear the pool and
+            # mock the server as unknown.
+            allow(server).to receive(:unknown!).and_wrap_original do |m, *args|
+              m.call(*args)
+              RSpec::Mocks.with_temporary_scope do
+                allow(server).to receive(:unknown?).and_return(true)
+                server.pool_internal&.clear(lazy: true)
+              end
+            end
           end
         )
-        spec.setup(@server, subscriber)
+
+        if app_name = spec.pool_options[:app_name]
+          allow(cluster).to receive(:app_metadata).and_return(Mongo::Server::AppMetadata.new({ app_name: app_name }))
+        end
+
+        @client = ClusterTools.instance.direct_client(ClusterConfig.instance.primary_address,
+          database: 'admin')
+        spec.setup(@server, @client, subscriber)
       end
 
       after do
-        if @server && (pool = @server.instance_variable_get('@pool'))
-          begin
-            pool.disconnect!
-          rescue Mongo::Error::PoolClosedError
-          end
+        if pool = @server&.pool_internal
+          pool.disconnect!
         end
+
+        spec.pool&.close
       end
 
       let!(:result) do
-        socket = double('fake socket')
-        allow(socket).to receive(:close)
-        # When linting, connection pool ensures the connection returned
-        # is connected.
-        allow(socket).to receive(:alive?).and_return(true)
-
-        allow_any_instance_of(Mongo::Server::Connection).to receive(:do_connect).and_return(socket)
         if @server.load_balancer?
           allow_any_instance_of(Mongo::Server::Connection).to receive(:service_id).and_return('very fake')
         end

data/spec/spec_tests/collection_management_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/command_monitoring_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/connection_string_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/spec_tests/crud_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/crud_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/data/change_streams_unified/change-streams-clusterTime.yml

@@ -0,0 +1,41 @@
+description: "change-streams-clusterTime"
+schemaVersion: "1.4"
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+
+runOnRequirements:
+  - minServerVersion: "4.0.0"
+    topologies: [ replicaset, load-balanced, sharded ]
+    serverless: forbid
+
+initialData:
+  - collectionName: *collection0
+    databaseName: *database0
+    documents: []
+
+tests:
+  - description: "clusterTime is present"
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: { _id: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          ns: { db: *database0, coll: *collection0 }
+          clusterTime: { $$exists: true }

data/spec/spec_tests/data/change_streams_unified/change-streams-disambiguatedPaths.yml

@@ -0,0 +1,103 @@
+description: "disambiguatedPaths"
+schemaVersion: "1.4"
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+
+runOnRequirements:
+  - minServerVersion: "6.1.0"
+    topologies: [ replicaset, load-balanced, sharded ]
+    serverless: forbid
+
+initialData:
+  - collectionName: *collection0
+    databaseName: *database0
+    documents: []
+
+tests:
+  - description: "disambiguatedPaths is not present when showExpandedEvents is false/unset"
+    operations:
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: { _id: 1, 'a': { '1': 1 } }
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { 'a.1': 2 } }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0, coll: *collection0 }
+          updateDescription:
+            updatedFields: { $$exists: true }
+            removedFields: { $$exists: true }
+            truncatedArrays: { $$exists: true }
+            disambiguatedPaths: { $$exists: false }
+
+  - description: "disambiguatedPaths is present on updateDescription when an ambiguous path is present"
+    operations:
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: { _id: 1, 'a': { '1': 1 } }
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [], showExpandedEvents: true }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { 'a.1': 2 } }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0, coll: *collection0 }
+          updateDescription:
+            updatedFields: { $$exists: true }
+            removedFields: { $$exists: true }
+            truncatedArrays: { $$exists: true }
+            disambiguatedPaths: { 'a.1': ['a', '1'] }
+
+  - description: "disambiguatedPaths returns array indices as integers"
+    operations:
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: { _id: 1, 'a': [{'1': 1 }] }
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [], showExpandedEvents: true }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { 'a.0.1': 2 } }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0, coll: *collection0 }
+          updateDescription:
+            updatedFields: { $$exists: true }
+            removedFields: { $$exists: true }
+            truncatedArrays: { $$exists: true }
+            disambiguatedPaths: { 'a.0.1': ['a', { $$type: 'int' },  '1'] }

data/spec/spec_tests/data/change_streams_unified/change-streams-errors.yml

@@ -74,9 +74,7 @@ tests:
   - description: Change Stream should error when _id is projected out
     runOnRequirements:
       - minServerVersion: "4.1.11"
-        # Removed load balanced tests as per RUBY-2952 because they were causing
-        # failures.
-        topologies: [ replicaset, sharded-replicaset ] #, load-balanced ]
+        topologies: [ replicaset, sharded, load-balanced ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -95,9 +93,7 @@ tests:
   - description: change stream errors on ElectionInProgress
     runOnRequirements:
       - minServerVersion: "4.2"
-        # Removed load balanced tests as per RUBY-2952 because they were causing
-        # failures.
-        topologies: [ replicaset, sharded-replicaset ] #, load-balanced ]
+        topologies: [ replicaset, sharded, load-balanced ]
     operations:
       - name: failPoint
         object: testRunner

data/spec/spec_tests/data/change_streams_unified/change-streams-pre_and_post_images.yml

@@ -4,7 +4,7 @@ schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "6.0.0"
-    topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    topologies: [ replicaset, sharded, load-balanced ]
     serverless: forbid
 
 createEntities:

data/spec/spec_tests/data/change_streams_unified/change-streams-resume-allowlist.yml

@@ -5,9 +5,7 @@ schemaVersion: "1.7"
 
 runOnRequirements:
   - minServerVersion: "3.6"
-    # Removed load balanced tests as per RUBY-2952 because they were causing
-    # failures.
-    topologies: [ replicaset, sharded-replicaset ] #, load-balanced ]
+    topologies: [ replicaset, sharded, load-balanced ]
     serverless: forbid
 
 createEntities: