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

Author: blink1073

.evergreen/run-tests.sh

@@ -32,6 +32,9 @@ AUTH=${AUTH:-noauth}
 SSL=${SSL:-nossl}
 TEST_ARGS="${*:1}"
 PYTHON=$(which python)
+# TODO: Remove when we drop PyPy 3.8 support.
+OLD_PYPY=$(python -c "import sys; print(sys.implementation.name.lower() == 'pypy' and sys.implementation.version < (7, 3, 12))")
+
 export PIP_QUIET=1  # Quiet by default
 export PIP_PREFER_BINARY=1 # Prefer binary dists by default
 
@@ -110,6 +113,9 @@ fi
 
 if [ "$COMPRESSORS" = "snappy" ]; then
     python -m pip install '.[snappy]'
+    if [ "$OLD_PYPY" == "True" ]; then
+        pip install "python-snappy<0.7.0"
+    fi
     PYTHON=python
 elif [ "$COMPRESSORS" = "zstd" ]; then
     python -m pip install zstandard
@@ -250,6 +256,9 @@ 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
 

pyproject.toml

@@ -71,7 +71,7 @@ ocsp = [
     "service_identity>=18.1.0",
 ]
 snappy = [
-    "python-snappy",
+    "python-snappy"
 ]
 # PYTHON-3423 Removed in 4.3 but kept here to avoid pip warnings.
 srv = []

test/command_logging/unacknowledged-write.json

@@ -1,6 +1,6 @@
 {
   "description": "unacknowledged-write",
-  "schemaVersion": "1.13",
+  "schemaVersion": "1.16",
   "createEntities": [
     {
       "client": {
@@ -53,11 +53,27 @@
               "_id": 2
             }
           }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "expectResult": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
         }
       ],
       "expectLogMessages": [
         {
           "client": "client",
+          "ignoreExtraMessages": true,
           "messages": [
             {
               "level": "debug",

test/command_monitoring/unacknowledgedBulkWrite.json

@@ -1,6 +1,6 @@
 {
   "description": "unacknowledgedBulkWrite",
-  "schemaVersion": "1.0",
+  "schemaVersion": "1.7",
   "createEntities": [
     {
       "client": {
@@ -64,11 +64,29 @@
             ],
             "ordered": false
           }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "expectResult": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": "unorderedBulkWriteInsertW0",
+              "x": 44
+            }
+          ]
         }
       ],
       "expectEvents": [
         {
           "client": "client",
+          "ignoreExtraEvents": true,
           "events": [
             {
               "commandStartedEvent": {

test/performance/perf_test.py

@@ -43,6 +43,7 @@
 import os
 import sys
 import tempfile
+import threading
 import time
 import warnings
 from typing import Any, List, Optional
@@ -101,10 +102,19 @@ def __exit__(self, *args):
         self.interval = self.end - self.start
 
 
+def threaded(n_threads, func):
+    threads = [threading.Thread(target=func) for _ in range(n_threads)]
+    for t in threads:
+        t.start()
+    for t in threads:
+        t.join()
+
+
 class PerformanceTest:
     dataset: str
     data_size: int
     fail: Any
+    n_threads: int = 1
 
     @classmethod
     def setUpClass(cls):
@@ -118,7 +128,7 @@ def tearDown(self):
         # Remove "Test" so that TestFlatEncoding is reported as "FlatEncoding".
         name = self.__class__.__name__[4:]
         median = self.percentile(50)
-        megabytes_per_sec = self.data_size / median / 1000000
+        megabytes_per_sec = (self.data_size * self.n_threads) / median / 1000000
         print(
             f"Completed {self.__class__.__name__} {megabytes_per_sec:.3f} MB/s, MEDIAN={self.percentile(50):.3f}s, "
             f"total time={duration:.3f}s, iterations={len(self.results)}"
@@ -128,7 +138,7 @@ def tearDown(self):
                 "info": {
                     "test_name": name,
                     "args": {
-                        "threads": 1,
+                        "threads": self.n_threads,
                     },
                 },
                 "metrics": [
@@ -163,7 +173,10 @@ def runTest(self):
             i += 1
             self.before()
             with Timer() as timer:
-                self.do_task()
+                if self.n_threads == 1:
+                    self.do_task()
+                else:
+                    threaded(self.n_threads, self.do_task)
             self.after()
             results.append(timer.interval)
             duration = time.monotonic() - start
@@ -308,6 +321,10 @@ def do_task(self):
             command("hello", True)
 
 
+class TestRunCommand8Threads(TestRunCommand):
+    n_threads = 8
+
+
 class TestDocument(PerformanceTest):
     def setUp(self):
         super().setUp()
@@ -356,6 +373,10 @@ def do_task(self):
             find_one({"_id": _id})
 
 
+class TestFindOneByID8Threads(TestFindOneByID):
+    n_threads = 8
+
+
 class SmallDocInsertTest(TestDocument):
     dataset = "small_doc.json"
 
@@ -395,6 +416,10 @@ def do_task(self):
         list(self.corpus.find())
 
 
+class TestFindManyAndEmptyCursor8Threads(TestFindManyAndEmptyCursor):
+    n_threads = 8
+
+
 class TestSmallDocBulkInsert(SmallDocInsertTest, unittest.TestCase):
     def do_task(self):
         self.corpus.insert_many(self.documents, ordered=True)

test/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.json

@@ -0,0 +1,18 @@
+{
+  "description": "entity-client-observeLogMessages-minProperties",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeLogMessages": {}
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}

test/unified-test-format/invalid/entity-client-observeLogMessages-property-type.json

@@ -0,0 +1,20 @@
+{
+  "description": "entity-client-observeLogMessages-property-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeLogMessages": {
+          "command": {}
+        }
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}

test/unified-test-format/invalid/entity-client-observeLogMessages-property-value.json

@@ -0,0 +1,20 @@
+{
+  "description": "entity-client-observeLogMessages-property-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeLogMessages": {
+          "command": "notALogLevel"
+        }
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}

test/unified-test-format/invalid/entity-client-observeLogMessages-type.json

@@ -0,0 +1,18 @@
+{
+  "description": "entity-client-observeLogMessages-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeLogMessages": 0
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}

test/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json

@@ -20,4 +20,4 @@
       ]
     }
   ]
-}
+}