mongo 2.17.1 → 2.18.1

data/spec/shared/share/Dockerfile.erb

@@ -12,15 +12,21 @@ server_url = "http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-#
 server_archive_basename = File.basename(server_url)
 server_extracted_dir = server_archive_basename.sub(/\.(tar\.gz|tgz)$/, '')
 
-toolchain_upper='291ba4a4e8297f142796e70eee71b99f333e35e1'
+# When changing, also update the hash in shlib/set_env.sh.
+TOOLCHAIN_VERSION='219833abad4d9d3bf43c0fef101a8ca082ac4ae9'
 
-ruby_toolchain_url = "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/ruby-toolchain-#{distro}-#{toolchain_upper}.tar.xz"
-#ruby_toolchain_url = "https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/#{distro}/#{toolchain_upper}/mongo_ruby_driver_toolchain_#{distro.gsub('-', '_')}_patch_#{toolchain_upper}_#{toolchain_lower}.tar.gz"
+def ruby_toolchain_url(ruby)
+  "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/#{TOOLCHAIN_VERSION}/#{distro}/#{ruby}.tar.xz"
+end
+
+#ruby_toolchain_url = "https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/#{distro}/#{TOOLCHAIN_VERSION}/mongo_ruby_driver_toolchain_#{distro.gsub('-', '_')}_patch_#{TOOLCHAIN_VERSION}_#{toolchain_lower}.tar.gz"
 
 %>
 
 FROM <%= base_image %>
 
+ENV DOCKER=1
+
 <% if debian? %>
 
   ENV DEBIAN_FRONTEND=noninteractive
@@ -33,15 +39,10 @@ FROM <%= base_image %>
 
 <% if ruby_head? %>
 
-  # To use current versions of mlaunch, Python 3.6+ is required.
-  # Most distros ship with older Pythons, therefore we need to install
+  # To use current versions of mlaunch, Python 3.7+ is required.
+  # Many distros ship with older Pythons, therefore we need to install
   # a newer Python from somewhere. This section installs the Python
-  # toolhcain which comes with recent Pythons.
-  # Alternatively, Ruby toolchain compiles its own copy of Python 3 but
-  # this is currently incomplete in that on older distros with old OpenSSL,
-  # the built Python has no ssl module and hence practically is unusable.
-  # Currently Ruby driver uses mtools-legacy which supports Python 2,
-  # avoiding this entire issue for the time being.
+  # toolchain which comes with recent Pythons.
 
   #RUN curl --retry 3 -fL <%= python_toolchain_url %> -o python-toolchain.tar.gz
   #RUN tar -xC /opt -zf python-toolchain.tar.gz
@@ -54,7 +55,7 @@ FROM <%= base_image %>
   # than bash.
   # Ruby runtime dependencies: libyaml-0-2
   # Compiling ruby libraries: gcc make
-  # Compiling pyhton packages: python2.7-dev
+  # Compiling python packages: python3-dev
   # JRuby: openjdk-8-jdk-headless
   # Server dependencies: libsnmp30 libcurl3/libcurl4
   # Determining OS we are running on: lsb-release
@@ -84,15 +85,6 @@ FROM <%= base_image %>
     tzdata shared-mime-info
   ) %>
 
-  <% if distro =~ /ubuntu1404/ %>
-    # For building python & setuptools
-    <% packages += %w(libssl-dev unzip) %>
-  <% end %>
-
-  <% if distro !~ /ubuntu2004/ %>
-    <% packages += %w(python2.7-dev) %>
-  <% end %>
-
   <% if distro =~ /ubuntu2004/ %>
     <% packages << 'libsnmp35' %>
   <% else %>
@@ -119,15 +111,16 @@ FROM <%= base_image %>
     <% packages << 'libcurl3' %>
   <% end %>
 
-  <% if distro =~ /ubuntu1804/ %>
+  <% if distro =~ /ubuntu1804|ubuntu2004/ %>
     <% packages << 'nodejs' %>
   <% end %>
 
   <% if distro =~ /ubuntu2004/ %>
-    <% packages += %w(ruby ruby2.7 bundler python2 python2-dev) %>
+    <% packages += %w(ruby ruby2.7 bundler) %>
   <% end %>
 
   RUN apt-get update && apt-get install -y <%= packages.join(' ') %>
+  
 <% else %>
 
   <% if distro =~ /rhel6/ %>
@@ -190,27 +183,13 @@ CFG
 
 <% if preload? %>
 
-  <% if distro =~ /ubuntu1404/ %>
-    
-    # I couldn't find a prebuilt package of anything more recent than 2.7.6
-    # for 14.04.
-    RUN curl --retry 3 -fL https://www.python.org/ftp/python/2.7.16/Python-2.7.16.tar.xz | \
-      tar xfJ - && \
-      cd Python-2.7.16 && \
-      ./configure && \
-      nice make -j4 && \
-      make install && \
-      cd .. && rm -rf Python-2.7.16
-      
-    ENV PATH=/usr/local/bin:$PATH
-    
-    RUN curl --retry 3 -fL -o setuptools-44.1.1.zip https://files.pythonhosted.org/packages/b2/40/4e00501c204b457f10fe410da0c97537214b2265247bc9a5bc6edd55b9e4/setuptools-44.1.1.zip && \
-      unzip setuptools-44.1.1.zip && \
-      cd setuptools-44.1.1 && \
-      python setup.py install && \
-      cd .. && rm -rf setuptools-44.1.1
-
-  <% end%>
+  <% if distro =~ /debian9|ubuntu1604|ubuntu1804/ %>
+    # Install python 3.7 for mlaunch.
+    RUN curl -fL --retry 3 https://github.com/p-mongodb/deps/raw/main/<%= distro %>-python37.tar.xz | \
+      tar xfJ - -C /opt
+    ENV PATH=/opt/python37/bin:$PATH
+    RUN python3 -V
+  <% end %>
 
   <% if true || distro =~ /rhel|ubuntu1604/ %>
 
@@ -226,30 +205,50 @@ CFG
     # therefore install it the manual way.
     #
     # https://pip.pypa.io/en/stable/installing/
-    RUN curl --retry 3 -fL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2
+    RUN curl --retry 3 -fL https://bootstrap.pypa.io/pip/get-pip.py | python3
+    RUN python3 -m pip install --upgrade pip setuptools wheel
 
   <% end %>
 
   # Current virtualenv fails with
   # https://github.com/pypa/virtualenv/issues/1630
-  <% if distro =~ /ubuntu2004/ %>
-    RUN python3 -m pip install 'virtualenv<20' 'mtools-legacy[mlaunch]'
+  <% mtools = 'legacy' %>
+  <% case mtools
+     when 'legacy' %>
+    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    RUN python3 -m pip install 'virtualenv<20' 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
+  <% 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 && \
+      python3 setup.py install
   <% else %>
-    RUN python2 -m pip install 'virtualenv<20' 'mtools-legacy[mlaunch]'
+    # mtools[mlaunch] does not work: https://github.com/rueckstiess/mtools/issues/856
+    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    RUN python3 -m pip install virtualenv 'pymongo>=4' python-dateutil psutil mtools
   <% end %>
 
-  RUN pip --version && \
-    pip install mtools-legacy[mlaunch]
-
   <% if @env.fetch('MONGODB_VERSION') >= '4.4' %>
     # ubuntu1604 installs MarkupSafe 0.0.0 here instead of 2.0.0+
     # as specified by dependencies, causing OCSP mock to not work.
     RUN python3 -mpip install asn1crypto oscrypto flask --upgrade
   <% end %>
 
+  # FLE is tested against 4.0+ servers.
+  <% if @env.fetch('MONGODB_VERSION') >= '4.0' %>
+    # Requirements in drivers-evergreen-tools:
+    # 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
+  <% end %>
+
   <% unless ruby_head? || system_ruby? %>
 
-    RUN curl --retry 3 -fL <%= ruby_toolchain_url %> |tar -xC /opt -Jf -
+    RUN curl --retry 3 -fL <%= ruby_toolchain_url(ruby) %> |tar -xC /opt -Jf -
     ENV PATH=/opt/rubies/<%= ruby %>/bin:$PATH \
       USE_OPT_TOOLCHAIN=1
     #ENV PATH=/opt/rubies/python/3/bin:$PATH
@@ -290,12 +289,15 @@ WORKDIR /app
 <% end %>
 
 <% if fle? %>
-  RUN curl --retry 3 -fLo libmongocrypt-all.tar.gz "https://s3.amazonaws.com/mciuploads/libmongocrypt/all/master/latest/libmongocrypt-all.tar.gz"
-  RUN tar xf libmongocrypt-all.tar.gz
+  RUN curl --retry 3 -fL "https://s3.amazonaws.com/mciuploads/libmongocrypt/all/master/latest/libmongocrypt-all.tar.gz" |tar zxf -
 
   <%= "ENV LIBMONGOCRYPT_PATH #{libmongocrypt_path}" %>
 <% end %>
 
+<% if preload? %>
+  ENV DOCKER_PRELOAD=1
+<% end %>
+
 ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
   PROJECT_DIRECTORY=/app \
   <%= @env.map { |k, v| %Q`#{k}="#{v.gsub('$', "\\$").gsub('"', "\\\"")}"` }.join(" \\\n  ") %>

data/spec/shared/shlib/config.sh

@@ -0,0 +1,27 @@
+show_local_instructions_impl() {
+  local arch="$1"
+  shift
+  
+  echo To test this configuration locally:
+  local params=
+  while test -n "$1"; do
+    key="$1"
+    shift
+    # ${!foo} syntax is bash specific:
+    # https://stackoverflow.com/questions/14049057/bash-expand-variable-in-a-variable
+    value="${!key}"
+    if test -n "$value"; then
+      params="$params $key=$value"
+    fi
+  done
+  
+  # $0 has the current script being executed which is also the script that
+  # was initially invoked EXCEPT for the AWS configurations which use the
+  # wrapper script.
+  if echo "$AUTH" |grep -q ^aws; then
+    script=.evergreen/run-tests-aws-auth.sh
+  else
+    script="$0"
+  fi
+  echo ./.evergreen/test-on-docker -d $arch $params -s "$script"
+}

data/spec/shared/shlib/distro.sh

@@ -13,7 +13,8 @@ _detect_distro() {
   if test -f /etc/debian_version; then
     # Debian or Ubuntu
     if test "`uname -m`" = aarch64; then
-      distro=ubuntu1604-arm
+      release=`lsb_release -rs |tr -d .`
+      distro="ubuntu$release"-arm
     elif lsb_release -is |grep -q Debian; then
       release=`lsb_release -rs |tr -d .`
       # In docker, release is something like 9.11.

data/spec/shared/shlib/server.sh

@@ -1,6 +1,18 @@
 # This file contains functions pertaining to downloading, starting and
 # configuring a MongoDB server.
 
+# Note that mlaunch is executed with (and therefore installed with) Python 2.
+# The reason for this is that in the past, some of the distros we tested on
+# had an ancient version of Python 3 that was unusable (e.g. it couldn't
+# install anything from PyPI due to outdated TLS/SSL implementation).
+# It is likely that all of the current distros we use have a recent enough
+# and working Python 3 implementation, such that we could use Python 3 for
+# everything.
+#
+# Note that some distros (e.g. ubuntu2004) do not contain a `python' binary
+# at all, thus python2 or python3 must be explicitly specified depending on
+# the desired version.
+
 set_fcv() {
   if test -n "$FCV"; then
     mongo --eval 'assert.commandWorked(db.adminCommand( { setFeatureCompatibilityVersion: "'"$FCV"'" } ));' "$MONGODB_URI"
@@ -34,44 +46,54 @@ prepare_server() {
   if test "$MONGODB_VERSION" = latest; then
     # Test on the most recent published 4.3 release.
     # https://jira.mongodb.org/browse/RUBY-1724
-    echo 'Using "latest" server is not currently implemented' 1>&2
-    exit 1
+
+    . $PROJECT_DIRECTORY/.mod/drivers-evergreen-tools/.evergreen/download-mongodb.sh
+
+    get_distro
+    get_mongodb_download_url_for "$DISTRO" "latest"
+    prepare_server_from_url $MONGODB_DOWNLOAD_URL
   else
     download_version="$MONGODB_VERSION"
+    url=`$(dirname $0)/get-mongodb-download-url $download_version $arch`
+    prepare_server_from_url $url
   fi
 
-  url=`$(dirname $0)/get-mongodb-download-url $download_version $arch`
-
-  prepare_server_from_url $url
 }
 
 prepare_server_from_url() {
   url=$1
 
-  mongodb_dir="$MONGO_ORCHESTRATION_HOME"/mdb
+  dirname=`basename $url |sed -e s/.tgz//`
+  mongodb_dir="$MONGO_ORCHESTRATION_HOME"/mdb/"$dirname"
   mkdir -p "$mongodb_dir"
-  curl --retry 3 $url |tar xz -C "$mongodb_dir" -f -
-  BINDIR="$mongodb_dir"/`basename $url |sed -e s/.tgz//`/bin
+  curl --retry 3 $url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
+  BINDIR="$mongodb_dir"/bin
   export PATH="$BINDIR":$PATH
 }
 
 install_mlaunch_virtualenv() {
-  python2 -V || true
-  if ! python2 -m virtualenv -h >/dev/null; then
+  python3 -V || true
+  if ! python3 -m virtualenv -h >/dev/null; then
     # Current virtualenv fails with
     # https://github.com/pypa/virtualenv/issues/1630
-    python2 -m pip install 'virtualenv<20' --user
+    python3 -m pip install 'virtualenv<20' --user
   fi
   if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
-    python2 -m pip list |grep mtools-legacy
+    python3 -m pip list |grep mtools
   then
     # Use the existing mtools-legacy
     :
   else
     venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-    python2 -m virtualenv -p python2 $venvpath
+    python3 -m virtualenv -p python3 $venvpath
     . $venvpath/bin/activate
-    pip install 'mtools-legacy[mlaunch]'
+    # [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
 }
 
@@ -84,7 +106,8 @@ install_mlaunch_pip() {
   python -V || true
   python3 -V || true
   pythonpath="$MONGO_ORCHESTRATION_HOME"/python
-  pip install -t "$pythonpath" 'mtools-legacy[mlaunch]'
+  # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+  pip install -t "$pythonpath" 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   export PATH="$pythonpath/bin":$PATH
   export PYTHONPATH="$pythonpath"
 }
@@ -108,7 +131,8 @@ install_mlaunch_git() {
     virtualenv -p python3 $venvpath
     . $venvpath/bin/activate
 
-    pip3 install psutil pymongo
+    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    pip3 install psutil pymongo python-dateutil
 
     git clone $repo mlaunch
     cd mlaunch
@@ -123,12 +147,13 @@ install_mlaunch_git() {
     virtualenv $venvpath
     . $venvpath/bin/activate
 
-    pip install psutil pymongo
+    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    pip install psutil pymongo python-dateutil
 
     git clone $repo mlaunch
     (cd mlaunch &&
       git checkout origin/$branch &&
-      python setup.py install
+      python2 setup.py install
     )
   fi
 }
@@ -148,7 +173,7 @@ calculate_server_args() {
   fi
 
   if test $mongo_version = latest; then
-    mongo_version=49
+    mongo_version=60
   fi
 
   local args="--setParameter enableTestCommands=1"
@@ -309,7 +334,7 @@ launch_ocsp_mock() {
 
 launch_server() {
   local dbdir="$1"
-  python -m mtools.mlaunch.mlaunch --dir "$dbdir" --binarypath "$BINDIR" $SERVER_ARGS
+  python3 -m mtools.mlaunch.mlaunch --dir "$dbdir" --binarypath "$BINDIR" $SERVER_ARGS
 
   if test "$TOPOLOGY" = sharded-cluster && test $MONGODB_VERSION = 3.6; then
     # On 3.6 server the sessions collection is not immediately available,
@@ -345,7 +370,7 @@ launch_server() {
             port="${BASH_REMATCH[1]}"
             mongoses+=("${base_url}:${port}")
         fi
-    done < <(python -m mtools.mlaunch.mlaunch list --dir "$dbdir" --binarypath "$BINDIR")
+    done < <(python2 -m mtools.mlaunch.mlaunch list --dir "$dbdir" --binarypath "$BINDIR")
 
     if [ -n "$config_server" ]; then
       ${mongo_command} "$config_server" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'

data/spec/shared/shlib/set_env.sh

@@ -1,4 +1,5 @@
-TOOLCHAIN_VERSION=289d4bec7c61e88000cea582c05fd8073b932122
+# When changing, also update the hash in share/Dockerfile.
+TOOLCHAIN_VERSION=219833abad4d9d3bf43c0fef101a8ca082ac4ae9
 
 set_env_java() {
   ls -l /opt || true
@@ -9,13 +10,13 @@ set_env_java() {
     export JAVACMD=/opt/java/jdk8/bin/java
     #export PATH=$PATH:/opt/java/jdk8/bin
   fi
-  
+
   # ppc64le has it in a different place
   if test -z "$JAVACMD" && [ -f /usr/lib/jvm/java-1.8.0/bin/java ]; then
     export JAVACMD=/usr/lib/jvm/java-1.8.0/bin/java
     #export PATH=$PATH:/usr/lib/jvm/java-1.8.0/bin
   fi
-  
+
   if true; then
     # newer
     # rhel71-ppc, https://jira.mongodb.org/browse/BUILD-9231
@@ -34,7 +35,7 @@ set_env_java() {
       # we will try the /usr/lib/jvm then
     fi
   fi
-  
+
   if test -n "$JAVACMD"; then
     eval $JAVACMD -version
   elif which java 2>/dev/null; then
@@ -44,6 +45,43 @@ set_env_java() {
   fi
 }
 
+set_env_python() {
+  if test "$DOCKER_PRELOAD" != 1; then
+    if test -n "$DOCKER"; then
+      # If we are running in Docker and not preloading, we need to fetch the
+      # Python binary.
+      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
+    elif test -d /opt/python37/bin; then
+      # Configurations that use Docker in Evergreen - these don't preload.
+      export PATH=/opt/python37/bin:$PATH
+    fi
+    
+    python3 -V
+  fi
+}
+
+set_env_node() {
+  if test "$DOCKER_PRELOAD" != 1; then
+    dir=`ls -d /opt/nodejs/node-v12* |head -1`
+    if test -z "$dir"; then
+      echo "Node 12 missing" 1>&2
+      exit 2
+    fi
+    export PATH="$dir/bin:$PATH"
+  elif test -d /opt/node/bin; then
+    # Node from toolchain in Evergreen
+    export PATH=/opt/node/bin:$PATH
+  fi
+  
+  node -v
+}
+
 set_env_ruby() {
   if test -z "$RVM_RUBY"; then
     echo "Empty RVM_RUBY, aborting"
@@ -79,7 +117,7 @@ set_env_ruby() {
 
     # For testing toolchains:
     #toolchain_url=https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/`host_distro`/f11598d091441ffc8d746aacfdc6c26741a3e629/mongo_ruby_driver_toolchain_`host_distro |tr - _`_patch_f11598d091441ffc8d746aacfdc6c26741a3e629_5e46f2793e8e866f36eda2c5_20_02_14_19_18_18.tar.gz
-    toolchain_url=http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/ruby-toolchain-`host_distro`-$TOOLCHAIN_VERSION.tar.xz
+    toolchain_url=http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/$TOOLCHAIN_VERSION/`host_distro`/$RVM_RUBY.tar.xz
     curl --retry 3 -fL $toolchain_url |tar Jxf -
     export PATH=`pwd`/rubies/$RVM_RUBY/bin:$PATH
     #export PATH=`pwd`/rubies/python/3/bin:$PATH

data/spec/solo/clean_exit_spec.rb

@@ -9,9 +9,14 @@ describe 'Clean exit' 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
 
   context 'with SRV URI' do
+
     let(:uri) do
       'mongodb+srv://test1.test.build.10gen.cc/?tls=false'
     end

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ require 'support/constraints'
 require 'support/authorization'
 require 'support/primary_socket'
 require 'support/cluster_tools'
-require 'rspec/retry'
 require 'support/monitoring_ext'
 
 RSpec.configure do |config|

data/spec/spec_tests/client_side_encryption_spec.rb

@@ -10,5 +10,5 @@ describe 'Client-Side Encryption' do
   require_libmongocrypt
   require_enterprise
 
-  define_transactions_spec_tests(CLIENT_SIDE_ENCRYPTION_TESTS)
+  define_transactions_spec_tests(CLIENT_SIDE_ENCRYPTION_TESTS, expectations_bson_types: false)
 end

data/spec/spec_tests/client_side_encryption_unified_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/client_side_encryption"
+CLIENT_SIDE_ENCRYPTION_UNIFIED_TESTS = Dir.glob("#{base}/unified/**/*.yml").sort
+
+describe 'Client side encryption spec tests - unified' do
+  require_libmongocrypt
+  require_enterprise
+
+  define_unified_spec_tests(base, CLIENT_SIDE_ENCRYPTION_UNIFIED_TESTS)
+end

data/spec/spec_tests/crud_spec.rb

@@ -10,13 +10,3 @@ describe 'CRUD v1 spec tests' do
     let(:client) { authorized_client }
   end
 end
-
-describe 'CRUD v2 spec tests' do
-  define_crud_spec_tests(CRUD2_TESTS) do |spec, req, test|
-    let(:client) do
-      authorized_client.use(spec.database_name || 'crud-default').tap do |client|
-        client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
-      end
-    end
-  end
-end

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

@@ -0,0 +1,124 @@
+description: "change-streams-errors"
+
+schemaVersion: "1.7"
+
+runOnRequirements:
+  - serverless: forbid
+
+createEntities:
+  - client:
+      id: &client0 client0
+      observeEvents: [ commandStartedEvent ]
+      ignoreCommandMonitoringEvents: [ killCursors ]
+      useMultipleMongoses: false
+  - client:
+      id: &globalClient globalClient
+      useMultipleMongoses: false
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+  - database:
+      id: &globalDatabase0 globalDatabase0
+      client: *globalClient
+      databaseName: *database0
+  - collection:
+      id: &globalCollection0 globalCollection0
+      database: *globalDatabase0
+      collectionName: *collection0
+
+initialData:
+  - collectionName: *collection0
+    databaseName: *database0
+    documents: []
+
+tests:
+  - description: "The watch helper must not throw a custom exception when executed against a single server topology, but instead depend on a server error"
+    runOnRequirements:
+      - minServerVersion: "3.6.0"
+        topologies: [ single ]
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        expectError: { errorCode: 40573 }
+
+  - description: Change Stream should error when an invalid aggregation stage is passed in
+    runOnRequirements:
+      - minServerVersion: "3.6.0"
+        topologies: [ replicaset ]
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: [ { $unsupported: foo } ]
+        expectError: { errorCode: 40324 }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream: {}
+                  - $unsupported: foo
+              commandName: aggregate
+              databaseName: *database0
+
+  - 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 ]
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline:
+            - $project: { _id: 0 }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { z: 3 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectError: { errorCode: 280 }
+
+  - 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 ]
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 216
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { z: 3 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectError: { errorCode: 216 }