mongoid 7.6.0 → 8.0.1

data/spec/shared/lib/mrss/utils.rb

@@ -3,35 +3,13 @@
 
 module Mrss
   module Utils
-    extend self
 
-    def print_backtrace(dest=STDERR)
-      raise
-    rescue => e
-      dest.puts e.backtrace.join("\n")
-    end
-
-    # Parses the given version string, accounting for suffix information that
-    # Gem::Version cannot successfully parse.
-    #
-    # @param [ String ] version the version to parse
-    #
-    # @return [ Gem::Version ] the parsed version
-    #
-    # @raise [ ArgumentError ] if the string cannot be parsed.
-    def parse_version(version)
-      Gem::Version.new(version)
-    rescue ArgumentError
-      match = version.match(/\A(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)?(-[A-Za-z\+\d]+)?\z/)
-      raise ArgumentError.new("Malformed version number string #{version}") if match.nil?
-
-      Gem::Version.new(
-        [
-          match[:major],
-          match[:minor],
-          match[:patch]
-        ].join('.')
-      )
+    module_function def print_backtrace(dest=STDERR)
+      begin
+        hello world
+      rescue => e
+        dest.puts e.backtrace.join("\n")
+      end
     end
   end
 end

data/spec/shared/share/Dockerfile.erb

@@ -1,9 +1,26 @@
+# Python toolchain as of this writing is available on rhel62, debian92 and
+# ubuntu1604.
+#
+# To run rhel62 in docker, host system must be configured to emulate syscalls:
+# https://github.com/CentOS/sig-cloud-instance-images/issues/103
+
 <%
 
+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_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'
+
 def ruby_toolchain_url(ruby)
-  "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/#{distro}/#{ruby}.tar.xz"
+  "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 %>
@@ -20,6 +37,18 @@ ENV DOCKER=1
 
 <% end %>
 
+<% if ruby_head? %>
+
+  # 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
+  # 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
+
+<% end %>
+
 <% if debian? %>
 
   # zsh is not required for any scripts but it is a better interactive shell
@@ -27,7 +56,7 @@ ENV DOCKER=1
   # Ruby runtime dependencies: libyaml-0-2
   # Compiling ruby libraries: gcc make
   # Compiling python packages: python3-dev
-  # JRuby: openjdk-17-jdk-headless
+  # JRuby: openjdk-8-jdk-headless
   # Server dependencies: libsnmp30 libcurl3/libcurl4
   # Determining OS we are running on: lsb-release
   # Load balancer testing: haproxy
@@ -48,45 +77,75 @@ ENV DOCKER=1
   # therefore install python-pip in all configurations here.
 
   <% packages = %w(
-    procps lsb-release bzip2 curl wget gpg zsh
-    git make gcc g++ libyaml-dev libgmp-dev zlib1g-dev libsnappy-dev
+    procps lsb-release bzip2 curl 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 libcurl4
-    tzdata shared-mime-info software-properties-common xz-utils nodejs npm
-    openjdk-17-jdk-headless
+    haproxy
+    python3-pip
+    tzdata shared-mime-info
   ) %>
 
   <% if distro =~ /ubuntu2004/ %>
     <% packages << 'libsnmp35' %>
-  <% elsif distro =~ /ubuntu2204|debian11/ %>
-    <% packages << 'libsnmp40' %>
   <% else %>
     <% packages << 'libsnmp30' %>
   <% end %>
 
-  <% if distro !~ /ubuntu2004|ubuntu2204|debian11/ %>
+  <% if distro !~ /ubuntu2004/ %>
     <% packages << 'python-pip' %>
   <% end %>
 
-  <% if distro =~ /ubuntu2204|debian11/ %>
-    <% packages << 'python3-venv' %>
+  <% if distro =~ /debian10/ %>
+    <% packages << 'openjdk-11-jdk-headless' %>
+  <% elsif distro =~ /ubuntu1404/ %>
+    # Ubuntu 14.04 only has openjdk 7, this is too old to be useful
+  <% else %>
+    <% packages << 'openjdk-8-jdk-headless' %>
   <% end %>
 
-  <% if distro =~ /ubuntu2004|ubuntu2204/ %>
-    <% packages += %w(ruby bundler) %>
+  # ubuntu1404, ubuntu1604: libcurl3
+  # ubuntu1804, ubuntu2004, debian10: libcurl4
+  <% if distro =~ /ubuntu1804|ubuntu2004|debian10/ %>
+    <% packages << 'libcurl4' %>
+  <% else %>
+    <% packages << 'libcurl3' %>
   <% end %>
 
-  RUN apt-get update && apt-get install -y <%= packages.join(' ') %>
+  <% if distro =~ /ubuntu1804|ubuntu2004/ %>
+    <% packages << 'nodejs' %>
+  <% end %>
 
-  <% 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
+  <% if distro =~ /ubuntu2004/ %>
+    <% packages += %w(ruby ruby2.7 bundler) %>
   <% end %>
-  RUN apt-add-repository ppa:deadsnakes/ppa -y
-  RUN apt-get update && apt-get install -y cmake python3.10 python3.10-dev python3.10-venv
-  RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1
+
+  RUN apt-get update && apt-get install -y <%= packages.join(' ') %>
+  
 <% 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
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
+#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
+baseurl=http://vault.centos.org/6.10/os/x86_64/
+gpgcheck=1
+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
@@ -95,16 +154,31 @@ ENV DOCKER=1
   # Kerberos tests: krb5-workstation + cyrus-sasl-devel to build the
   # mongo_kerberos gem + cyrus-sasl-gssapi for authentication to work
   # Local Kerberos server: krb5-server
-  # JRuby: java-17-openjdk
+  # JRuby: java-1.8.0-openjdk
   #
   # Note: lacking cyrus-sasl-gssapi produces a cryptic message
   # "SASL(-4): no mechanism available: No worthy mechs found"
   # https://github.com/farorm/python-ad/issues/10
 
-  RUN yum --enablerepo=powertools install -y redhat-lsb-core which git gcc gcc-c++ libyaml-devel krb5-server \
-    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-17-openjdk \
-    net-snmp python38 python38-devel cmake nodejs npm xz
+  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
+
+  <% if distro =~ /rhel6/ %>
+
+    # RHEL 6 ships with Python 2.6.
+
+    RUN yum install -y centos-release-scl && \
+      yum install -y python27-python python27-python-devel
+    ENV PATH=/opt/rh/python27/root/usr/bin:$PATH \
+      LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib64
+
+  <% else %>
+
+    RUN yum install -y python-devel
 
+  <% end %>
+  
 <% end %>
 
 <% if preload? %>
@@ -146,7 +220,7 @@ ENV DOCKER=1
   <% 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 && \
@@ -160,7 +234,7 @@ ENV DOCKER=1
   <% 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 --ignore-installed
+    RUN python3 -mpip install asn1crypto oscrypto flask --upgrade
   <% end %>
 
   # FLE is tested against 4.0+ servers.
@@ -169,7 +243,7 @@ ENV DOCKER=1
     # 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 'sqlalchemy<2.0.0'
+    RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0
   <% end %>
 
   <% unless ruby_head? || system_ruby? %>
@@ -177,9 +251,14 @@ ENV DOCKER=1
     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
 
   <% 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/ %>
@@ -219,8 +298,6 @@ WORKDIR /app
   ENV DOCKER_PRELOAD=1
 <% end %>
 
-RUN npm install --global yarn
-
 ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
   PROJECT_DIRECTORY=/app \
   <%= @env.map { |k, v| %Q`#{k}="#{v.gsub('$', "\\$").gsub('"', "\\\"")}"` }.join(" \\\n  ") %>
@@ -231,9 +308,6 @@ 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/distro.sh

@@ -64,16 +64,6 @@ _detect_distro() {
       release=`echo $release |sed -e s/7/70/ -e s/6/62/ -e s/8/80/`
       distro=rhel$release
     fi
-  elif test -f /etc/os-release; then
-    name=`grep -o '^NAME=.*' /etc/os-release | awk -F '"' '{ print $2 }'`
-    version=`grep -o '^VERSION=.*' /etc/os-release | awk -F '"' '{ print $2 }'`
-    if test "$name" = "Amazon Linux"; then
-      distro=amazon$version
-    else
-      cat /etc/os-release
-      echo 'Unknown distro' 1>&2
-      exit 1
-    fi
   else
     lsb_release -a
     echo 'Unknown distro' 1>&2

data/spec/shared/shlib/server.sh

@@ -35,50 +35,48 @@ add_uri_option() {
 }
 
 prepare_server() {
+  arch=$1
+
   if test -n "$USE_OPT_MONGODB"; then
     export BINDIR=/opt/mongodb/bin
     export PATH=$BINDIR:$PATH
     return
   fi
 
-  . $PROJECT_DIRECTORY/.mod/drivers-evergreen-tools/.evergreen/download-mongodb.sh
+  if test "$MONGODB_VERSION" = latest; then
+    # Test on the most recent published 4.3 release.
+    # https://jira.mongodb.org/browse/RUBY-1724
+
+    . $PROJECT_DIRECTORY/.mod/drivers-evergreen-tools/.evergreen/download-mongodb.sh
 
-  get_distro
-  arch="${1:-$DISTRO}"
+    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
 
-  get_mongodb_download_url_for "$arch" "$MONGODB_VERSION"
-  prepare_server_from_url "$MONGODB_DOWNLOAD_URL" "$MONGOSH_DOWNLOAD_URL"
 }
 
 prepare_server_from_url() {
-  server_url=$1
-  mongosh_url=$2
+  url=$1
 
-  dirname=`basename $server_url |sed -e s/.tgz//`
+  dirname=`basename $url |sed -e s/.tgz//`
   mongodb_dir="$MONGO_ORCHESTRATION_HOME"/mdb/"$dirname"
   mkdir -p "$mongodb_dir"
-  curl --retry 3 $server_url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
-
-  if test -n "$mongosh_url"; then
-    curl --retry 3 $mongosh_url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
-  fi
-
+  curl --retry 3 $url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
   BINDIR="$mongodb_dir"/bin
   export PATH="$BINDIR":$PATH
 }
 
-install_mlaunch_venv() {
+install_mlaunch_virtualenv() {
   python3 -V || true
-  if ! python3 -m venv -h >/dev/null; then
+  if ! python3 -m virtualenv -h >/dev/null; then
     # Current virtualenv fails with
     # https://github.com/pypa/virtualenv/issues/1630
-    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 update && sudo apt-get install --yes python3-venv
+    python3 -m pip install 'virtualenv<20' --user
   fi
   if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
     python3 -m pip list |grep mtools
@@ -86,21 +84,15 @@ install_mlaunch_venv() {
     # Use the existing mtools-legacy
     :
   else
-    # 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
-
+    venvpath="$MONGO_ORCHESTRATION_HOME"/venv
+    python3 -m virtualenv -p python3 $venvpath
+    . $venvpath/bin/activate
     # [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 --upgrade setuptools
     pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi
 }
@@ -166,32 +158,6 @@ install_mlaunch_git() {
   fi
 }
 
-install_haproxy() {
-  if ! command -v haproxy &> /dev/null; then
-    if ! command -v apt-get &> /dev/null; then
-      # no apt-get; assume RHEL
-      sudo yum -y install haproxy
-    else
-      sudo apt-get update && sudo apt-get install --yes haproxy
-    fi
-  else
-    echo 'haproxy is present'
-  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 update && 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
@@ -207,7 +173,7 @@ calculate_server_args() {
   fi
 
   if test $mongo_version = latest; then
-    mongo_version=70
+    mongo_version=60
   fi
 
   local args="--setParameter enableTestCommands=1"
@@ -218,14 +184,17 @@ calculate_server_args() {
     args="$args --setParameter acceptAPIVersion2=1"
   fi
 
-  args="$args --setParameter diagnosticDataCollectionEnabled=false"
-
+  # diagnosticDataCollectionEnabled is a mongod-only parameter on server 3.2,
+  # and mlaunch does not support specifying mongod-only parameters:
+  # https://github.com/rueckstiess/mtools/issues/696
+  # Pass it to 3.4 and newer servers where it is accepted by all daemons.
+  if test $mongo_version -ge 34; then
+    args="$args --setParameter diagnosticDataCollectionEnabled=false"
+  fi
   local uri_options=
   if test "$TOPOLOGY" = replica-set; then
     args="$args --replicaset --name test-rs --nodes 2 --arbiter"
     export HAVE_ARBITER=1
-  elif test "$TOPOLOGY" = replica-set-single-node; then
-    args="$args --replicaset --name test-rs --nodes 1"
   elif test "$TOPOLOGY" = sharded-cluster; then
     args="$args --replicaset --nodes 2 --sharded 1 --name test-rs"
     if test -z "$SINGLE_MONGOS"; then

data/spec/shared/shlib/set_env.sh

@@ -1,15 +1,39 @@
 # When changing, also update the hash in share/Dockerfile.
-JDK_VERSION=jdk21
+TOOLCHAIN_VERSION=219833abad4d9d3bf43c0fef101a8ca082ac4ae9
 
 set_env_java() {
   ls -l /opt || true
   ls -l /usr/lib/jvm || true
 
   # Use toolchain java if it exists
-  if [ -f /opt/java/$JDK_VERSION/bin/java ]; then
-    export JAVACMD=/opt/java/$JDK_VERSION/bin/java
+  if [ -f /opt/java/jdk8/bin/java ]; then
+    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
+    if test -z "$JAVACMD" &&
+      (ls /opt/java || true) |grep -q java-1.8.0-openjdk-1.8.0 &&
+      test -f /opt/java/java-1.8.0-openjdk-1.8.0*/bin/java;
+    then
+      path=$(cd /opt/java && ls -d java-1.8.0-openjdk-1.8.0* |head -n 1)
+      export JAVACMD=/opt/java/"$path"/bin/java
+    fi
   else
-    echo Could not find $JDK_VERSION in /opt/java
+    # older
+    # rhel71-ppc seems to have an /opt/java/jdk8/bin/java but it doesn't work
+    if test -n "$JAVACMD" && ! exec $JAVACMD -version; then
+      JAVACMD=
+      # we will try the /usr/lib/jvm then
+    fi
   fi
 
   if test -n "$JAVACMD"; then
@@ -29,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
@@ -37,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
 }
@@ -54,7 +78,7 @@ set_env_node() {
     # Node from toolchain in Evergreen
     export PATH=/opt/node/bin:$PATH
   fi
-
+  
   node -v
 }
 
@@ -89,13 +113,34 @@ set_env_ruby() {
     if test "$USE_OPT_TOOLCHAIN" = 1; then
       # Nothing, also PATH is already set
       :
+    elif true; then
+
+    # 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/$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
+
+    # Attempt to get bundler to report all errors - so far unsuccessful
+    #curl --retry 3 -o bundler-openssl.diff https://github.com/bundler/bundler/compare/v2.0.1...p-mongo:report-errors.diff
+    #find . -path \*/lib/bundler/fetcher.rb -exec patch {} bundler-openssl.diff \;
+
     else
-      # For testing unpublished builds:
-      #build_url=https://s3.amazonaws.com/mciuploads/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz
 
-      build_url=http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz
-      curl --retry 3 -fL $build_url |tar Jxf -
-      export PATH=`pwd`/rubies/$RVM_RUBY/bin:$PATH
+    # Normal operation
+    if ! test -d $HOME/.rubies/$RVM_RUBY/bin; then
+      echo "Ruby directory does not exist: $HOME/.rubies/$RVM_RUBY/bin" 1>&2
+      echo "Contents of /opt:" 1>&2
+      ls -l /opt 1>&2 || true
+      echo ".rubies symlink:" 1>&2
+      ls -ld $HOME/.rubies 1>&2 || true
+      echo "Our rubies:" 1>&2
+      ls -l $HOME/.rubies 1>&2 || true
+      exit 2
+    fi
+    export PATH=$HOME/.rubies/$RVM_RUBY/bin:$PATH
+
     fi
 
     ruby --version
@@ -106,5 +151,19 @@ set_env_ruby() {
 
     ruby -v |fgrep $ruby_name
     ruby -v |fgrep $ruby_version
+
+    # We shouldn't need to update rubygems, and there is value in
+    # testing on whatever rubygems came with each supported ruby version
+    #echo 'updating rubygems'
+    #gem update --system
+
+    # Only install bundler when not using ruby-head.
+    # ruby-head comes with bundler and gem complains
+    # because installing bundler would overwrite the bundler binary.
+    # We now install bundler in the toolchain, hence nothing needs to be done
+    # in the tests.
+    if false && echo "$RVM_RUBY" |grep -q jruby; then
+      gem install bundler -v '<2'
+    fi
   fi
 }

data/spec/support/constraints.rb

@@ -27,6 +27,30 @@ module Constraints
     Mongo::VERSION.split('.')[0...precision].map(&:to_i)
   end
 
+  def min_bson_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = bson_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) < 0
+        skip "bson-ruby version #{version} or higher is required"
+      end
+    end
+  end
+
+  def max_bson_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = bson_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) > 0
+        skip "bson-ruby version #{version} or lower is required"
+      end
+    end
+  end
+
+  def bson_version(precision)
+    BSON::VERSION.split('.')[0...precision].map(&:to_i)
+  end
+
   def min_rails_version(version)
     unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"

data/spec/support/expectations.rb

@@ -2,30 +2,27 @@
 
 module Mongoid
   module Expectations
-    # Previously this method used RSpec::Mocks with .exactly.times(n).and_call_original,
-    # which stopped working reliably in Ruby 3.3. Now we directly wrap the target method.
-    def expect_query(number)
-      if %i[ sharded load-balanced ].include?(ClusterConfig.instance.topology) && number > 0
-        skip 'This spec requires replica set or standalone topology'
-      end
 
-      klass = Mongo::Server::ConnectionBase
-      original_method = klass.instance_method(:command_started)
-      query_count = 0
+    def connection_class
+      if defined?(Mongo::Server::ConnectionBase)
+        Mongo::Server::ConnectionBase
+      else
+        # Pre-2.8 drivers
+        Mongo::Server::Connection
+      end
+    end
 
-      begin
-        klass.define_method(:command_started) do |*args, **kwargs|
-          query_count += 1
-          original_method.bind_call(self, *args, **kwargs)
+    def expect_query(number)
+      rv = nil
+      RSpec::Mocks.with_temporary_scope do
+        if number > 0
+          expect_any_instance_of(connection_class).to receive(:command_started).exactly(number).times.and_call_original
+        else
+          expect_any_instance_of(connection_class).not_to receive(:command_started)
         end
-
-        result = yield
-        expect(query_count).to eq(number)
-        result
-      ensure
-        klass.remove_method(:command_started)
-        klass.define_method(:command_started, original_method)
+        rv = yield
       end
+      rv
     end
 
     def expect_no_queries(&block)