fixups

Author: blink1073

.evergreen/run-tests.sh

@@ -6,7 +6,8 @@ SCRIPT_DIR=$(dirname ${BASH_SOURCE:-$0})
 SCRIPT_DIR="$( cd -- "$SCRIPT_DIR" > /dev/null 2>&1 && pwd )"
 ROOT_DIR="$(dirname $SCRIPT_DIR)"
 
-pushd $ROOT_DIR
+PREV_DIR=$(pwd)
+cd $ROOT_DIR
 
 # Try to source the env file.
 if [ -f $SCRIPT_DIR/scripts/env.sh ]; then
@@ -25,7 +26,17 @@ else
   exit 1
 fi
 
+cleanup_tests() {
+  # Avoid leaving the lock file in a changed state when we change the resolution type.
+  if [ -n "TEST_MIN_DEPS" ]; then
+    git checkout uv.lock || true
+  fi
+  cd $PREV_DIR
+}
+
+trap "cleanup_tests" SIGINT ERR
+
 # Start the test runner.
 uv run ${UV_ARGS} --reinstall .evergreen/scripts/run_tests.py "$@"
 
-popd
+cleanup_tests()

CONTRIBUTING.md

@@ -387,8 +387,6 @@ If you are running one of the `no-responder` tests, omit the `run-server` step.
 To run any of the test suites with minimum supported dependencies, pass `--test-min-deps` to
 `just setup-tests`.
 
-Note: the lock file will be modified by the test, make sure to revert `uv.lock` before committing.
-
 ## Adding a new test suite
 
 - If adding new tests files that should only be run for that test suite, add a pytest marker to the file and add

test/__init__.py

@@ -519,6 +519,19 @@ def require_libmongocrypt_min(self, *ver):
             "Libmongocrypt version must be at least %s" % str(other_version),
         )
 
+    def require_pymongocrypt_min(self, *ver):
+        other_version = Version(*ver)
+        if not _HAVE_PYMONGOCRYPT:
+            version = Version.from_string("0.0.0")
+        else:
+            from pymongocrypt import __version__ as pymongocrypt_version
+
+            version = Version.from_string(pymongocrypt_version)
+        return self._require(
+            lambda: version >= other_version,
+            "PyMongoCrypt version must be at least %s" % str(other_version),
+        )
+
     def require_auth(self, func):
         """Run a test only if the server is running with auth enabled."""
         return self._require(

test/asynchronous/__init__.py

@@ -519,6 +519,19 @@ def require_libmongocrypt_min(self, *ver):
             "Libmongocrypt version must be at least %s" % str(other_version),
         )
 
+    def require_pymongocrypt_min(self, *ver):
+        other_version = Version(*ver)
+        if not _HAVE_PYMONGOCRYPT:
+            version = Version.from_string("0.0.0")
+        else:
+            from pymongocrypt import __version__ as pymongocrypt_version
+
+            version = Version.from_string(pymongocrypt_version)
+        return self._require(
+            lambda: version >= other_version,
+            "PyMongoCrypt version must be at least %s" % str(other_version),
+        )
+
     def require_auth(self, func):
         """Run a test only if the server is running with auth enabled."""
         return self._require(

test/asynchronous/test_encryption.py

@@ -3448,6 +3448,7 @@ class TestExplicitTextEncryptionProse(AsyncEncryptionIntegrationTest):
     @async_client_context.require_no_standalone
     @async_client_context.require_version_min(8, 2, -1)
     @async_client_context.require_libmongocrypt_min(1, 15, 1)
+    @async_client_context.require_pymongocrypt_min(1, 16, 0)
     async def asyncSetUp(self):
         await super().asyncSetUp()
         # Load the file key1-document.json as key1Document.

test/test_encryption.py

@@ -3430,6 +3430,7 @@ class TestExplicitTextEncryptionProse(EncryptionIntegrationTest):
     @client_context.require_no_standalone
     @client_context.require_version_min(8, 2, -1)
     @client_context.require_libmongocrypt_min(1, 15, 1)
+    @client_context.require_pymongocrypt_min(1, 16, 0)
     def setUp(self):
         super().setUp()
         # Load the file key1-document.json as key1Document.