diff --git a/test/__init__.py b/test/__init__.py index ee6e3ca509..3800c7890e 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -284,6 +284,7 @@ def client_options(self): def uri(self): """Return the MongoClient URI for creating a duplicate client.""" opts = client_context.default_client_options.copy() + opts.pop("server_api", None) # Cannot be set from the URI opts_parts = [] for opt, val in opts.items(): strval = str(val) diff --git a/test/sigstop_sigcont.py b/test/sigstop_sigcont.py index ef4730f0bf..87b4f62038 100644 --- a/test/sigstop_sigcont.py +++ b/test/sigstop_sigcont.py @@ -15,12 +15,19 @@ """Used by test_client.TestClient.test_sigstop_sigcont.""" import logging +import os import sys sys.path[0:0] = [""] from pymongo import monitoring from pymongo.mongo_client import MongoClient +from pymongo.server_api import ServerApi + +SERVER_API = None +MONGODB_API_VERSION = os.environ.get("MONGODB_API_VERSION") +if MONGODB_API_VERSION: + SERVER_API = ServerApi(MONGODB_API_VERSION) class HeartbeatLogger(monitoring.ServerHeartbeatListener): @@ -55,6 +62,7 @@ def main(uri: str) -> None: event_listeners=[heartbeat_logger], heartbeatFrequencyMS=500, connectTimeoutMS=500, + server_api=SERVER_API, ) client.admin.command("ping") logging.info("TEST STARTED")