diff --git a/.evergreen/config.yml b/.evergreen/config.yml index e67101c0..30a9c374 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -346,33 +346,6 @@ tasks: # Test tasks {{{ - - name: "test-4.0-standalone" - tags: ["4.0", "standalone"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - VERSION: "4.0" - TOPOLOGY: "server" - - func: "run tox" - - - name: "test-4.0-replica_set" - tags: ["4.0", "replica_set"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - VERSION: "4.0" - TOPOLOGY: "replica_set" - - func: "run tox" - - - name: "test-4.0-sharded_cluster" - tags: ["4.0", "sharded_cluster"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - VERSION: "4.0" - TOPOLOGY: "sharded_cluster" - - func: "run tox" - - name: "test-4.2-standalone" tags: ["4.2", "standalone"] commands: diff --git a/doc/conf.py b/doc/conf.py index 0322e3b6..664c3a12 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -75,6 +75,9 @@ pygments_style = "sphinx" linkcheck_ignore = [r"http://localhost:\d+"] +# Allow for flaky links. +linkcheck_retries = 3 + # -- Options for extensions ---------------------------------------------------- autoclass_content = "init" diff --git a/test/tornado_tests/test_motor_client.py b/test/tornado_tests/test_motor_client.py index 5bd0b53c..e2591804 100644 --- a/test/tornado_tests/test_motor_client.py +++ b/test/tornado_tests/test_motor_client.py @@ -25,7 +25,7 @@ from test.utils import AUTO_ISMASTER, get_primary_pool, one import pymongo import pymongo.mongo_client from bson import CodecOptions -from mockupdb import OpQuery +from mockupdb import OpMsg, OpQuery from pymongo import CursorType, ReadPreference, WriteConcern from pymongo.common import MIN_SUPPORTED_WIRE_VERSION from pymongo.driver_info import DriverInfo @@ -234,7 +234,8 @@ class MotorClientExhaustCursorTest(MotorMockServerTest): # With Tornado, simply accessing fetch_next starts the fetch. fetch_next = cursor.fetch_next - request = await self.run_thread(server.receives, OpQuery) + expected = OpQuery if pymongo.version_tuple[0:2] < (4, 14) else OpMsg({}) + request = await self.run_thread(server.receives, expected) request.fail(code=1) with self.assertRaises(pymongo.errors.OperationFailure): @@ -245,10 +246,12 @@ class MotorClientExhaustCursorTest(MotorMockServerTest): @gen_test async def test_exhaust_query_server_error_standalone(self): + raise self.skipTest("MOTOR-1472") await self._test_exhaust_query_server_error(rs=False) @gen_test async def test_exhaust_query_server_error_rs(self): + raise self.skipTest("MOTOR-1472") await self._test_exhaust_query_server_error(rs=True) async def _test_exhaust_query_network_error(self, rs): @@ -267,7 +270,8 @@ class MotorClientExhaustCursorTest(MotorMockServerTest): # With Tornado, simply accessing fetch_next starts the fetch. fetch_next = cursor.fetch_next - request = await self.run_thread(server.receives, OpQuery) + expected = OpQuery if pymongo.version_tuple[0:2] < (4, 14) else OpMsg({}) + request = await self.run_thread(server.receives, expected) request.hangs_up() with self.assertRaises(pymongo.errors.ConnectionFailure): diff --git a/test/tornado_tests/test_motor_core.py b/test/tornado_tests/test_motor_core.py index 65ff4ed2..45aecc03 100644 --- a/test/tornado_tests/test_motor_core.py +++ b/test/tornado_tests/test_motor_core.py @@ -35,7 +35,7 @@ pymongo_gridfs_only = set(["delete_by_name", "rename_by_name"]) motor_client_only = motor_only.union(["open"]) -pymongo_client_only = set(["eq_props"]).union(pymongo_only) +pymongo_client_only = set(["eq_props", "append_metadata"]).union(pymongo_only) pymongo_database_only = set([]).union(pymongo_only)