PYTHON-4585 Cursor.to_list does not apply client's timeoutMS setting #1860
+78
−4
Conversation
This file contains 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
ShaneHarvey
requested changes
Sep 17, 2024
| @@ -1444,6 +1455,21 @@ async def test_command_cursor_to_list_length(self): | |||
| result = await db.test.aggregate([pipeline]) | |||
| self.assertEqual(len(await result.to_list(1)), 1) | |||
|
|
|||
| @async_client_context.require_change_streams | |||
| @async_client_context.require_failCommand_fail_point | |||
| async def test_command_cursor_to_list_csot_applied(self): | |||
There was a problem hiding this comment.
2 things:
- Let's use regular aggregate here since there's nothing special about $changeStream here and it complicates the test.
- The failCommands needs to be for "getMore", not "aggregate" since
await client.db.test.aggregate()actually runs the aggregate command and to_list only runs getMore. We'll need to set batchSize to ensure at least 1 getMore even runs.
| cursor = coll.find({"$where": delay(2)}) | ||
| with self.assertRaises(PyMongoError) as ctx: | ||
| await cursor.to_list() | ||
| self.assertTrue(ctx.exception.timeout) |
|
@sleepyStick you'll need to resync from master and use the convenience class methods to create the clients. |
ShaneHarvey
reviewed
Sep 17, 2024
pymongo/asynchronous/cursor.py
Outdated
| @@ -294,6 +295,7 @@ def _clone(self, deepcopy: bool = True, base: Optional[AsyncCursor] = None) -> A | |||
| "limit", | |||
| "max_time_ms", | |||
| "max_await_time_ms", | |||
| "timeout", | |||
There was a problem hiding this comment.
We shouldn't need to add timeout here since it's already set implicitly in _clone_base.
There was a problem hiding this comment.
hm i didn't at first but i was failing test_clone and adding this seemed to fix it >.<
i'll undo this change in my next commit though in case i'm mis-remembering
edit: i mis-remembered LOL deleting it passes the test_clone locally, thanks for pointing this out to me!!
sleepyStick
force-pushed
the
PYTHON-4585
branch
from
0e54e3d to
311754d
Compare
sleepyStick
force-pushed
the
PYTHON-4585
branch
from
bd3c4cd to
b420572
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.