From 22e7f55ea16befe7192c883c2719f47a70e2c383 Mon Sep 17 00:00:00 2001 From: Iris Ho Date: Fri, 31 Jan 2025 19:48:50 -0800 Subject: [PATCH 1/3] Convert test.test_server_selection_rtt to async --- .../asynchronous/test_server_selection_rtt.py | 76 +++++++++++++++++++ test/test_server_selection_rtt.py | 10 ++- tools/synchro.py | 1 + 3 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 test/asynchronous/test_server_selection_rtt.py diff --git a/test/asynchronous/test_server_selection_rtt.py b/test/asynchronous/test_server_selection_rtt.py new file mode 100644 index 0000000000..0011774763 --- /dev/null +++ b/test/asynchronous/test_server_selection_rtt.py @@ -0,0 +1,76 @@ +# Copyright 2015 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. + +"""Test the topology module.""" +from __future__ import annotations + +import json +import os +import sys +from pathlib import Path + +sys.path[0:0] = [""] + +from test import unittest + +from pymongo.read_preferences import MovingAverage + +_IS_SYNC = False + +# Location of JSON test specifications. +if _IS_SYNC: + TEST_PATH = os.path.join(Path(__file__).resolve().parent, "server_selection/rtt") +else: + TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "server_selection/rtt") + + +class TestAllScenarios(unittest.IsolatedAsyncioTestCase): + pass + + +def create_test(scenario_def): + def run_scenario(self): + moving_average = MovingAverage() + + if scenario_def["avg_rtt_ms"] != "NULL": + moving_average.add_sample(scenario_def["avg_rtt_ms"]) + + if scenario_def["new_rtt_ms"] != "NULL": + moving_average.add_sample(scenario_def["new_rtt_ms"]) + + self.assertAlmostEqual(moving_average.get(), scenario_def["new_avg_rtt"]) + + return run_scenario + + +def create_tests(): + for dirpath, _, filenames in os.walk(TEST_PATH): + dirname = os.path.split(dirpath)[-1] + + for filename in filenames: + with open(os.path.join(dirpath, filename)) as scenario_stream: + scenario_def = json.load(scenario_stream) + + # Construct test from scenario. + new_test = create_test(scenario_def) + test_name = f"test_{dirname}_{os.path.splitext(filename)[0]}" + + new_test.__name__ = test_name + setattr(TestAllScenarios, new_test.__name__, new_test) + + +create_tests() + +if __name__ == "__main__": + unittest.main() diff --git a/test/test_server_selection_rtt.py b/test/test_server_selection_rtt.py index a129af4585..c9aaf602e8 100644 --- a/test/test_server_selection_rtt.py +++ b/test/test_server_selection_rtt.py @@ -18,6 +18,7 @@ import json import os import sys +from pathlib import Path sys.path[0:0] = [""] @@ -25,8 +26,13 @@ from pymongo.read_preferences import MovingAverage +_IS_SYNC = True + # Location of JSON test specifications. -_TEST_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "server_selection/rtt") +if _IS_SYNC: + TEST_PATH = os.path.join(Path(__file__).resolve().parent, "server_selection/rtt") +else: + TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "server_selection/rtt") class TestAllScenarios(unittest.TestCase): @@ -49,7 +55,7 @@ def run_scenario(self): def create_tests(): - for dirpath, _, filenames in os.walk(_TEST_PATH): + for dirpath, _, filenames in os.walk(TEST_PATH): dirname = os.path.split(dirpath)[-1] for filename in filenames: diff --git a/tools/synchro.py b/tools/synchro.py index eb44ef4ac0..57bbb25913 100644 --- a/tools/synchro.py +++ b/tools/synchro.py @@ -225,6 +225,7 @@ def async_only_test(f: str) -> bool: "test_retryable_writes.py", "test_retryable_writes_unified.py", "test_session.py", + "test_server_selection_rtt.py", "test_transactions.py", "unified_format.py", ] From 7f579d41cae6b648d8f8456b125c62909846bdaf Mon Sep 17 00:00:00 2001 From: Iris <58442094+sleepyStick@users.noreply.github.com> Date: Mon, 3 Feb 2025 11:44:47 -0800 Subject: [PATCH 2/3] Update test/asynchronous/test_server_selection_rtt.py Co-authored-by: Noah Stapp --- test/asynchronous/test_server_selection_rtt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/asynchronous/test_server_selection_rtt.py b/test/asynchronous/test_server_selection_rtt.py index 0011774763..0d7bfa7e42 100644 --- a/test/asynchronous/test_server_selection_rtt.py +++ b/test/asynchronous/test_server_selection_rtt.py @@ -35,7 +35,7 @@ TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "server_selection/rtt") -class TestAllScenarios(unittest.IsolatedAsyncioTestCase): +class TestAllScenarios(AsyncPyMongoTestCase): pass From 8e1605bc2f48bc91acb3ce833cc8479d4c51ed12 Mon Sep 17 00:00:00 2001 From: Iris Ho Date: Mon, 3 Feb 2025 11:55:25 -0800 Subject: [PATCH 3/3] run pre-commit --- test/asynchronous/test_server_selection_rtt.py | 1 + test/test_server_selection_rtt.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/asynchronous/test_server_selection_rtt.py b/test/asynchronous/test_server_selection_rtt.py index 0d7bfa7e42..1f8f6bc7df 100644 --- a/test/asynchronous/test_server_selection_rtt.py +++ b/test/asynchronous/test_server_selection_rtt.py @@ -23,6 +23,7 @@ sys.path[0:0] = [""] from test import unittest +from test.asynchronous import AsyncPyMongoTestCase from pymongo.read_preferences import MovingAverage diff --git a/test/test_server_selection_rtt.py b/test/test_server_selection_rtt.py index c9aaf602e8..2aef36a585 100644 --- a/test/test_server_selection_rtt.py +++ b/test/test_server_selection_rtt.py @@ -22,7 +22,7 @@ sys.path[0:0] = [""] -from test import unittest +from test import PyMongoTestCase, unittest from pymongo.read_preferences import MovingAverage @@ -35,7 +35,7 @@ TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "server_selection/rtt") -class TestAllScenarios(unittest.TestCase): +class TestAllScenarios(PyMongoTestCase): pass