Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PYTHON-5103 Convert test.test_server_selection_rtt to async #2122

Merged
merged 5 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions test/asynchronous/test_server_selection_rtt.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# 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 test.asynchronous import AsyncPyMongoTestCase

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(AsyncPyMongoTestCase):
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()
14 changes: 10 additions & 4 deletions test/test_server_selection_rtt.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,24 @@
import json
import os
import sys
from pathlib import Path

sys.path[0:0] = [""]

from test import unittest
from test import PyMongoTestCase, unittest

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):
class TestAllScenarios(PyMongoTestCase):
pass


Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions tools/synchro.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ def async_only_test(f: str) -> bool:
"test_retryable_writes_unified.py",
"test_run_command.py",
"test_session.py",
"test_server_selection_rtt.py",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this not the synchro change for this file?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops wrong PR sorry, looks good!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all good, there are too many PRs in flight rn, i'm struggling to keep track of them all in reviews HAHA

"test_sessions_unified.py",
"test_srv_polling.py",
"test_ssl.py",
Expand Down
Loading