From c77f68559b0e5d552b8e50b8349004113a890bff Mon Sep 17 00:00:00 2001 From: Iris Ho Date: Fri, 31 Jan 2025 19:42:49 -0800 Subject: [PATCH 1/2] Convert test.test_server_selection_logging to async --- .../test_server_selection_logging.py | 45 +++++++++++++++++++ test/test_server_selection_logging.py | 10 ++++- tools/synchro.py | 1 + 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 test/asynchronous/test_server_selection_logging.py diff --git a/test/asynchronous/test_server_selection_logging.py b/test/asynchronous/test_server_selection_logging.py new file mode 100644 index 0000000000..2c37b255c1 --- /dev/null +++ b/test/asynchronous/test_server_selection_logging.py @@ -0,0 +1,45 @@ +# Copyright 2024-present MongoDB, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Run the server selection logging unified format spec tests.""" +from __future__ import annotations + +import os +import sys +from pathlib import Path + +sys.path[0:0] = [""] + +from test import unittest +from test.unified_format import generate_test_classes + +_IS_SYNC = False + +# Location of JSON test specifications. +if _IS_SYNC: + TEST_PATH = os.path.join(Path(__file__).resolve().parent, "server_selection_logging") +else: + TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "server_selection_logging") + + +globals().update( + generate_test_classes( + TEST_PATH, + module=__name__, + ) +) + + +if __name__ == "__main__": + unittest.main() diff --git a/test/test_server_selection_logging.py b/test/test_server_selection_logging.py index 2df749cb10..d53d8dc84f 100644 --- a/test/test_server_selection_logging.py +++ b/test/test_server_selection_logging.py @@ -17,19 +17,25 @@ import os import sys +from pathlib import Path sys.path[0:0] = [""] from test import unittest from test.unified_format import generate_test_classes +_IS_SYNC = True + # Location of JSON test specifications. -_TEST_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "server_selection_logging") +if _IS_SYNC: + TEST_PATH = os.path.join(Path(__file__).resolve().parent, "server_selection_logging") +else: + TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "server_selection_logging") globals().update( generate_test_classes( - _TEST_PATH, + TEST_PATH, module=__name__, ) ) diff --git a/tools/synchro.py b/tools/synchro.py index eb44ef4ac0..8528f7a6b8 100644 --- a/tools/synchro.py +++ b/tools/synchro.py @@ -224,6 +224,7 @@ def async_only_test(f: str) -> bool: "test_retryable_reads_unified.py", "test_retryable_writes.py", "test_retryable_writes_unified.py", + "test_server_selection_logging.py", "test_session.py", "test_transactions.py", "unified_format.py", From d3848860b6e60313c7ee0e4b111cc4c09176019b Mon Sep 17 00:00:00 2001 From: Iris <58442094+sleepyStick@users.noreply.github.com> Date: Mon, 3 Feb 2025 11:45:27 -0800 Subject: [PATCH 2/2] Update test/asynchronous/test_server_selection_logging.py Co-authored-by: Noah Stapp --- test/asynchronous/test_server_selection_logging.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/asynchronous/test_server_selection_logging.py b/test/asynchronous/test_server_selection_logging.py index 2c37b255c1..6b0975318a 100644 --- a/test/asynchronous/test_server_selection_logging.py +++ b/test/asynchronous/test_server_selection_logging.py @@ -22,7 +22,7 @@ sys.path[0:0] = [""] from test import unittest -from test.unified_format import generate_test_classes +from test.asynchronous.unified_format import generate_test_classes _IS_SYNC = False