-
Notifications
You must be signed in to change notification settings - Fork 1.1k
PYTHON-5784 Coverage increase for periodic_executor.py
#2771
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
Draft
aclark4life
wants to merge
9
commits into
mongodb:master
Choose a base branch
from
aclark4life:PYTHON-5784
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d12f796
PYTHON-5784 Increase code coverage for periodic_executor.py from 79.2…
aclark4life 48f7307
PYTHON-5784 Use _run() helper for async tests to match test_network_l…
aclark4life 12b41c6
PYTHON-5784 Spell out 'coro' parameter as 'coroutine' in _run helper
aclark4life d23eb86
PYTHON-5784 Address Copilot feedback: remove unused import, fix depre…
aclark4life 5b259b2
PYTHON-5784 Address Noah's review: move async tests to test/asynchron…
aclark4life 7400105
PYTHON-5784 Nit fixes
aclark4life 622f46c
Noah feedback
aclark4life 0b948d8
Fix typing errors
aclark4life 71a240c
Copilot + Noah review
aclark4life File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # Copyright 2026-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. | ||
|
|
||
| """Async-only unit tests for AsyncPeriodicExecutor.""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import sys | ||
|
|
||
| sys.path[0:0] = [""] | ||
|
|
||
| from test.asynchronous import AsyncUnitTest, unittest | ||
|
|
||
| from pymongo.periodic_executor import AsyncPeriodicExecutor | ||
|
|
||
|
|
||
| class TestAsyncPeriodicExecutorExceptions(AsyncUnitTest): | ||
| async def test_target_exception_stops_executor(self): | ||
| call_count = 0 | ||
|
|
||
| async def target(): | ||
| nonlocal call_count | ||
| call_count += 1 | ||
| raise RuntimeError("error") | ||
|
|
||
| executor = AsyncPeriodicExecutor( | ||
| interval=30.0, min_interval=0.01, target=target, name="test" | ||
| ) | ||
| executor.open() | ||
| await executor.join(timeout=2) | ||
| if executor._task is not None and executor._task.done(): | ||
| executor._task.exception() | ||
| self.assertEqual(call_count, 1, "target should stop after exception") | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| # Copyright 2026-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. | ||
|
|
||
| """Unit tests for periodic_executor.py.""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import asyncio | ||
| import sys | ||
| import threading | ||
| import time | ||
|
|
||
| sys.path[0:0] = [""] | ||
|
|
||
| from test.asynchronous import AsyncUnitTest, unittest | ||
|
|
||
| from pymongo.periodic_executor import AsyncPeriodicExecutor | ||
|
|
||
| _IS_SYNC = False | ||
|
|
||
|
|
||
| class TestAsyncPeriodicExecutor(AsyncUnitTest): | ||
| def _make_executor(self, interval=30.0, min_interval=0.01, target=None, name="test"): | ||
| if target is None: | ||
|
|
||
| async def target(): | ||
| return True | ||
|
|
||
| executor = AsyncPeriodicExecutor( | ||
| interval=interval, min_interval=min_interval, target=target, name=name | ||
| ) | ||
| self.addAsyncCleanup(self._close_executor, executor) | ||
| return executor | ||
|
|
||
| async def _close_executor(self, executor): | ||
| executor.close() | ||
| await executor.join(timeout=2) | ||
|
|
||
| async def test_join_without_open_is_safe(self): | ||
| executor = self._make_executor() | ||
| try: | ||
| await executor.join(timeout=0.01) | ||
| except Exception as e: | ||
| self.fail(f"join() raised unexpected Exception {e}") | ||
|
|
||
| async def test_target_returning_false_stops_executor(self): | ||
| if _IS_SYNC: | ||
| ran = threading.Event() | ||
| else: | ||
| ran = asyncio.Event() | ||
|
|
||
| async def target(): | ||
| ran.set() | ||
| return False | ||
|
|
||
| executor = self._make_executor(target=target) | ||
| executor.open() | ||
| await executor.join(timeout=2) | ||
| self.assertTrue(ran.is_set(), "target never ran") | ||
|
|
||
| async def test_skip_sleep_flag_skips_interval(self): | ||
| call_times = [] | ||
|
|
||
| async def target(): | ||
| call_times.append(time.monotonic()) | ||
| if len(call_times) >= 2: | ||
| return False | ||
| return True | ||
|
|
||
| executor = self._make_executor(interval=30.0, min_interval=0.001, target=target) | ||
| executor.skip_sleep() | ||
| executor.open() | ||
| await executor.join(timeout=3) | ||
| self.assertGreaterEqual(len(call_times), 2) | ||
| self.assertLess(call_times[1] - call_times[0], 5.0) | ||
|
|
||
| async def test_wake_causes_early_run(self): | ||
| call_count = 0 | ||
| if _IS_SYNC: | ||
| woken = threading.Event() | ||
| else: | ||
| woken = asyncio.Event() | ||
|
|
||
| async def target(): | ||
| nonlocal call_count | ||
| call_count += 1 | ||
| if call_count == 1: | ||
| woken.set() | ||
| return call_count < 2 | ||
|
|
||
| executor = self._make_executor(interval=30.0, min_interval=0.01, target=target) | ||
| executor.open() | ||
| if _IS_SYNC: | ||
| woken.wait(timeout=2) | ||
| else: | ||
| assert isinstance(woken, asyncio.Event) | ||
| await asyncio.wait_for(woken.wait(), timeout=2) | ||
| executor.wake() | ||
| await executor.join(timeout=3) | ||
| self.assertGreaterEqual(call_count, 2) | ||
|
|
||
| async def test_open_after_target_returns_false(self): | ||
| called = 0 | ||
|
|
||
| async def target(): | ||
| nonlocal called | ||
| called += 1 | ||
| return False | ||
|
|
||
| executor = self._make_executor(target=target) | ||
| executor.open() | ||
| await executor.join(timeout=2) | ||
| executor.open() | ||
| await executor.join(timeout=2) | ||
| self.assertGreaterEqual(called, 2) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| # Copyright 2026-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. | ||
|
|
||
| """Unit tests for periodic_executor.py.""" | ||
|
|
||
|
aclark4life marked this conversation as resolved.
|
||
| from __future__ import annotations | ||
|
|
||
| import asyncio | ||
| import sys | ||
| import threading | ||
| import time | ||
|
|
||
| sys.path[0:0] = [""] | ||
|
|
||
| from test.synchronous import UnitTest, unittest | ||
|
|
||
|
|
||
| from pymongo.periodic_executor import PeriodicExecutor | ||
|
|
||
| _IS_SYNC = False | ||
|
|
||
|
|
||
|
|
||
| class TestAsyncPeriodicExecutor(UnitTest): | ||
|
|
||
| def _make_executor(self, interval=30.0, min_interval=0.01, target=None, name="test"): | ||
| if target is None: | ||
|
|
||
| def target(): | ||
| return True | ||
|
|
||
| executor = PeriodicExecutor( | ||
| interval=interval, min_interval=min_interval, target=target, name=name | ||
| ) | ||
| self.addCleanup(self._close_executor, executor) | ||
| return executor | ||
|
|
||
| def _close_executor(self, executor): | ||
| executor.close() | ||
| executor.join(timeout=2) | ||
|
|
||
| def test_join_without_open_is_safe(self): | ||
| executor = self._make_executor() | ||
| try: | ||
| executor.join(timeout=0.01) | ||
| except Exception as e: | ||
| self.fail(f"join() raised unexpected Exception {e}") | ||
|
|
||
| def test_target_returning_false_stops_executor(self): | ||
| if _IS_SYNC: | ||
| ran = threading.Event() | ||
| else: | ||
| ran = asyncio.Event() | ||
|
|
||
| def target(): | ||
| ran.set() | ||
| return False | ||
|
|
||
| executor = self._make_executor(target=target) | ||
| executor.open() | ||
| executor.join(timeout=2) | ||
| self.assertTrue(ran.is_set(), "target never ran") | ||
|
|
||
|
Comment on lines
+57
to
+71
|
||
| def test_skip_sleep_flag_skips_interval(self): | ||
| call_times = [] | ||
|
|
||
| def target(): | ||
| call_times.append(time.monotonic()) | ||
| if len(call_times) >= 2: | ||
| return False | ||
| return True | ||
|
|
||
| executor = self._make_executor(interval=30.0, min_interval=0.001, target=target) | ||
| executor.skip_sleep() | ||
| executor.open() | ||
| executor.join(timeout=3) | ||
| self.assertGreaterEqual(len(call_times), 2) | ||
| self.assertLess(call_times[1] - call_times[0], 5.0) | ||
|
|
||
| def test_wake_causes_early_run(self): | ||
| call_count = 0 | ||
| if _IS_SYNC: | ||
| woken = threading.Event() | ||
| else: | ||
| woken = asyncio.Event() | ||
|
|
||
| def target(): | ||
| nonlocal call_count | ||
| call_count += 1 | ||
| if call_count == 1: | ||
| woken.set() | ||
| return call_count < 2 | ||
|
|
||
| executor = self._make_executor(interval=30.0, min_interval=0.01, target=target) | ||
| executor.open() | ||
| if _IS_SYNC: | ||
| woken.wait(timeout=2) | ||
| else: | ||
| assert isinstance(woken, asyncio.Event) | ||
| asyncio.wait_for(woken.wait(), timeout=2) | ||
| executor.wake() | ||
| executor.join(timeout=3) | ||
| self.assertGreaterEqual(call_count, 2) | ||
|
|
||
| def test_open_after_target_returns_false(self): | ||
| called = 0 | ||
|
|
||
| def target(): | ||
| nonlocal called | ||
| called += 1 | ||
| return False | ||
|
|
||
| executor = self._make_executor(target=target) | ||
| executor.open() | ||
| executor.join(timeout=2) | ||
| executor.open() | ||
| executor.join(timeout=2) | ||
| self.assertGreaterEqual(called, 2) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here as above, prefer
nonlocalover the list trick.