try to account for crypt shared location

Author: jamis

.evergreen/run-tests.sh

@@ -213,6 +213,13 @@ if test -n "$FLE"; then
     cd -
   fi
 
+  # work around error about trying to load a different crypt_shared lib when one
+  # is already loaded. Note that putting the shared library in the current directory
+  # means it will always be located, even if crypt_shared_lib_path is not set.
+  cp ${MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH} ${PROJECT_DIRECTORY}
+  export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=${PROJECT_DIRECTORY}/mongo_crypt_v1.so
+  export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PROJECT_DIRECTORY}
+
   # Start the KMS servers first so that they are launching while we are
   # fetching libmongocrypt.
   if test "$DOCKER_PRELOAD" != 1; then
@@ -344,6 +351,7 @@ if test "$COMPRESSOR" = zstd; then
   add_uri_option compressors=zstd
 fi
 
+# TEST_CMD="bundle exec rspec -f d spec/mongo/client_construction_spec.rb"
 
 echo "Running tests"
 set +e

spec/integration/client_side_encryption/kms_tls_options_spec.rb

@@ -17,13 +17,6 @@
       )
     end
 
-    # 6.0 mongocrypt expects a JSON-compatible error message from the KMS, but
-    # the mock KMS server returns an HTML error page.
-    let(:affected_by_mock_kms_server_change) do
-      (kms_provider == 'azure' || kms_provider == 'gcp') &&
-        ClusterConfig.instance.server_version < '7.0'
-    end
-
     let(:client_encryption_no_client_cert) do
       Mongo::ClientEncryption.new(
         client,
@@ -320,7 +313,7 @@
         end
 
         it 'raises KmsError directly without wrapping CryptError' do
-          if should_raise_with_tls && !affected_by_mock_kms_server_change
+          if should_raise_with_tls
             begin
               client_encryption_with_tls.create_data_key(
                 kms_provider,
@@ -329,9 +322,8 @@
               }
               )
             rescue Mongo::Error::KmsError => exc
-              exc.message.should =~ /Error when connecting to KMS provider|Empty KMS response/
-              exc.message.should =~ /libmongocrypt error code/
-              exc.message.should_not =~ /CryptError/
+              expect(exc.message).to include('libmongocrypt error code')
+              expect(exc.message).not_to include('CryptError')
             else
               fail 'Expected to raise KmsError'
             end

spec/mongo/client_construction_spec.rb

@@ -178,6 +178,8 @@
 
         let(:extra_options) do
           {
+            crypt_shared_lib_path: SpecConfig.instance.crypt_shared_lib_path,
+            crypt_shared_lib_required: SpecConfig.instance.crypt_shared_lib_required,
             mongocryptd_uri: mongocryptd_uri,
             mongocryptd_bypass_spawn: mongocryptd_bypass_spawn,
             mongocryptd_spawn_path: mongocryptd_spawn_path,
@@ -299,7 +301,12 @@
               expect(encryption_options[:extra_options][:mongocryptd_spawn_path]).to eq(mongocryptd_spawn_path)
               expect(encryption_options[:extra_options][:mongocryptd_spawn_args]).to eq(mongocryptd_spawn_args)
 
-              expect(client.encrypter.mongocryptd_client.options[:monitoring_io]).to be false
+              if (SpecConfig.instance.crypt_shared_lib_path || '').strip.length > 0
+                expect(client.encrypter.mongocryptd_client).to be_nil
+              else
+                expect(client.encrypter.mongocryptd_client).not_to be_nil
+                expect(client.encrypter.mongocryptd_client.options[:monitoring_io]).to be false
+              end
             end
 
             context 'with default extra options' do
@@ -1998,7 +2005,7 @@
               block_client.encrypter.mongocryptd_client,
               block_client.encrypter.key_vault_client,
               block_client.encrypter.metadata_client
-            ].each do |crypt_client|
+            ].compact.each do |crypt_client|
               expect(crypt_client.cluster.connected?).to be false
             end
           end

spec/support/crypt.rb

@@ -23,21 +23,6 @@ module Crypt
 
   # For all FLE-related tests
   shared_context 'define shared FLE helpers' do
-    # SERVER-118428 -- mongocryptd rejects large messages
-    # DRIVERS-3382 -- once SERVER-118428 is fixed, remove these checks
-    before do
-      if extra_options[:mongocryptd_uri]
-        version = ClusterConfig.instance.server_version
-        bad_mongocryptd = case version
-          when /^8\.2/ then version >= '8.2.4'
-          when /^8\.0/ then version >= '8.0.18'
-          when /^7\.0/ then version >= '7.0.29'
-          else false
-          end
-        skip 'Bad mongocryptd version -- see DRIVERS-3382' if bad_mongocryptd
-      end
-    end
-
     # 96-byte binary string, base64-encoded local master key
     let(:local_master_key_b64) do
       Crypt::LOCAL_MASTER_KEY_B64