PYTHON-4362 Resync CMAP tests (#1586)

Author: ShaneHarvey

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/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"],