MOTOR-951 Test against MongoDB 6.0 (#174)

.evergreen/config.yml

@@ -608,6 +608,33 @@ tasks:
             TOPOLOGY: "sharded_cluster"
         - func: "run tox"
 
+    - name: "test-6.0-standalone"
+      tags: [ "6.0", "standalone" ]
+      commands:
+        - func: "bootstrap mongo-orchestration"
+          vars:
+            VERSION: "6.0"
+            TOPOLOGY: "server"
+        - func: "run tox"
+
+    - name: "test-6.0-replica_set"
+      tags: [ "6.0", "replica_set" ]
+      commands:
+        - func: "bootstrap mongo-orchestration"
+          vars:
+            VERSION: "6.0"
+            TOPOLOGY: "replica_set"
+        - func: "run tox"
+
+    - name: "test-6.0-sharded_cluster"
+      tags: [ "6.0", "sharded_cluster" ]
+      commands:
+        - func: "bootstrap mongo-orchestration"
+          vars:
+            VERSION: "6.0"
+            TOPOLOGY: "sharded_cluster"
+        - func: "run tox"
+
     - name: "test-latest-standalone"
       tags: ["latest", "standalone"]
       commands:
@@ -748,18 +775,18 @@ axes:
            TOX_ENV: "asyncio-py310"
            PYTHON_BINARY: "/opt/python/3.10/bin/python3"
 
-  # Test Python 3.7 only on Mac.
+  # Test Python 3.8 only on Mac.
   - id: tox-env-osx
     display_name: "Tox Env OSX"
     values:
-      - id: "tornado5-py37"
+      - id: "tornado5-py38"
         variables:
-           TOX_ENV: "tornado5-py37"
-           PYTHON_BINARY: "/Library/Frameworks/Python.framework/Versions/3.7/bin/python3"
-      - id: "tornado_git-py37"
+           TOX_ENV: "tornado5-py38"
+           PYTHON_BINARY: "/Library/Frameworks/Python.framework/Versions/3.8/bin/python3"
+      - id: "tornado_git-py38"
         variables:
-           TOX_ENV: "tornado_git-py37"
-           PYTHON_BINARY: "/Library/Frameworks/Python.framework/Versions/3.7/bin/python3"
+           TOX_ENV: "tornado_git-py38"
+           PYTHON_BINARY: "/Library/Frameworks/Python.framework/Versions/3.8/bin/python3"
 
   - id: tox-env-win
     display_name: "Tox Env Windows"
@@ -801,12 +828,12 @@ axes:
         variables:
            INSTALL_TOX: true
            VIRTUALENV: "/cygdrive/c/python/Python37/python.exe -m virtualenv"
-      - id: "macos-1014"
-        display_name: "macOS 10.14"
-        run_on: "macos-1014"
+      - id: "macos-1100"
+        display_name: "macOS 11.00"
+        run_on: "macos-1100"
         variables:
            INSTALL_TOX: true
-           VIRTUALENV: "/Library/Frameworks/Python.framework/Versions/3.7/bin/python3 -m venv"
+           VIRTUALENV: "/Library/Frameworks/Python.framework/Versions/3.8/bin/python3 -m venv"
 
 buildvariants:
 
@@ -825,6 +852,7 @@ buildvariants:
       ssl: "ssl"
   tasks:
      - ".latest"
+     - ".6.0"
      - ".5.0"
      - ".4.4"
      - ".4.2"
@@ -839,6 +867,7 @@ buildvariants:
     ssl: "*"
   tasks:
      - ".latest"
+     - ".6.0"
      - ".5.0"
      - ".4.4"
 
@@ -850,6 +879,7 @@ buildvariants:
     ssl: "*"
   tasks:
      - ".latest"
+     - ".6.0"
      - ".5.0"
      - ".4.4"
      - ".4.2"
@@ -859,11 +889,12 @@ buildvariants:
 - matrix_name: "test-macos"
   display_name: "${os}-${tox-env-osx}-${ssl}"
   matrix_spec:
-    os: "macos-1014"
+    os: "macos-1100"
     tox-env-osx: "*"
     ssl: "*"
   tasks:
      - ".latest"
+     - ".6.0"
 
 - matrix_name: "enterprise-auth"
   display_name: "Enterprise Auth-${tox-env}"

synchro/__init__.py

@@ -51,6 +51,12 @@ from pymongo import (
     ssl_support,
     write_concern,
 )
+
+# Added for API compat with pymongo.
+try:
+    from pymongo import _csot
+except ImportError:
+    pass
 from pymongo.auth import *
 from pymongo.auth import _build_credentials_tuple, _password_digest
 from pymongo.client_session import TransactionOptions, _TxnState

test/asyncio_tests/test_asyncio_change_stream.py

@@ -18,6 +18,7 @@ import asyncio
 import copy
 import threading
 import time
+import unittest
 from test import SkipTest, env
 from test.asyncio_tests import AsyncIOTestCase, asyncio_test
 from test.utils import get_async_test_timeout, wait_until
@@ -181,6 +182,7 @@ class TestAsyncIOChangeStream(AsyncIOTestCase):
             pass
 
     @asyncio_test
+    @unittest.skip("Failing due to: https://jira.mongodb.org/browse/PYTHON-3389.")
     async def test_missing_id(self):
         coll = self.collection
         change_stream = coll.watch([{"$project": {"_id": 0}}])

test/tornado_tests/test_motor_change_stream.py

@@ -17,6 +17,7 @@
 import copy
 import threading
 import time
+import unittest
 from test import SkipTest, env
 from test.tornado_tests import MotorTest
 from test.utils import get_async_test_timeout, wait_until
@@ -168,6 +169,7 @@ class MotorChangeStreamTest(MotorTest):
             pass
 
     @gen_test
+    @unittest.skip("Failing due to: https://jira.mongodb.org/browse/PYTHON-3389.")
     async def test_missing_id(self):
         coll = self.collection
         change_stream = coll.watch([{"$project": {"_id": 0}}])