Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

.evergreen/run-tests.sh

@@ -254,11 +254,6 @@ if [ -n "$COVERAGE" ] && [ "$PYTHON_IMPL" = "CPython" ]; then
 fi
 
 if [ -n "$GREEN_FRAMEWORK" ]; then
-    # Install all optional deps to ensure lazy imports are getting patched.
-    python -m pip install -q ".[aws,encryption,gssapi,ocsp,snappy,zstd]"
-    if [ "$OLD_PYPY" == "True" ]; then
-        pip install "python-snappy<0.7.0"
-    fi
     python -m pip install $GREEN_FRAMEWORK
 fi
 

test/__init__.py

@@ -129,6 +129,9 @@
 }
 KMIP_CREDS = {"endpoint": os.environ.get("FLE_KMIP_ENDPOINT", "localhost:5698")}
 
+# Ensure Evergreen metadata doesn't result in truncation
+os.environ.setdefault("MONGOB_LOG_MAX_DOCUMENT_LENGTH", "2000")
+
 
 def is_server_resolvable():
     """Returns True if 'server' is resolvable."""

test/connection_logging/connection-pool-options.json

@@ -300,7 +300,6 @@
     },
     {
       "description": "waitQueueSize should be included in connection pool created message when specified",
-      "skipReason": "PyMongo does not support waitQueueSize",
       "operations": [
         {
           "name": "createEntities",
@@ -379,7 +378,6 @@
     },
     {
       "description": "waitQueueMultiple should be included in connection pool created message when specified",
-      "skipReason": "PyMongo does not support waitQueueMultiple",
       "operations": [
         {
           "name": "createEntities",
@@ -457,4 +455,4 @@
       ]
     }
   ]
-}
+}

test/connection_monitoring/pool-checkout-maxConnecting-is-enforced.json

@@ -19,7 +19,7 @@
       ],
       "closeConnection": false,
       "blockConnection": true,
-      "blockTimeMS": 750
+      "blockTimeMS": 800
     }
   },
   "poolOptions": {
@@ -53,7 +53,7 @@
     },
     {
       "name": "wait",
-      "ms": 100
+      "ms": 400
     },
     {
       "name": "checkOut",

test/test_command_logging.py

@@ -26,8 +26,6 @@
 # Location of JSON test specifications.
 _TEST_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "command_logging")
 
-os.environ["MONGOB_LOG_MAX_DOCUMENT_LENGTH"] = "2000"
-
 globals().update(
     generate_test_classes(
         _TEST_PATH,

test/test_transactions_unified.py

@@ -20,9 +20,15 @@
 
 sys.path[0:0] = [""]
 
-from test import unittest
+from test import client_context, unittest
 from test.unified_format import generate_test_classes
 
+
+@client_context.require_no_mmap
+def setUpModule():
+    pass
+
+
 # Location of JSON test specifications.
 TEST_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "transactions", "unified")
 

test/unified_format.py

@@ -495,6 +495,10 @@ def _create_entity(self, entity_spec, uri=None):
                     kwargs["h"] = client_context.mongos_seeds()
             kwargs.update(spec.get("uriOptions", {}))
             server_api = spec.get("serverApi")
+            if "waitQueueSize" in kwargs:
+                raise unittest.SkipTest("PyMongo does not support waitQueueSize")
+            if "waitQueueMultiple" in kwargs:
+                raise unittest.SkipTest("PyMongo does not support waitQueueMultiple")
             if server_api:
                 kwargs["server_api"] = ServerApi(
                     server_api["version"],
@@ -1770,6 +1774,8 @@ def check_log_messages(self, operations, spec):
         def format_logs(log_list):
             client_to_log = defaultdict(list)
             for log in log_list:
+                if log.module == "ocsp_support":
+                    continue
                 data = json_util.loads(log.message)
                 client = data.pop("clientId")
                 client_to_log[client].append(