Repository navigation
fix: match sequence-valued params in query_param_matcher #816
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
Open
dylanpulver
wants to merge
3
commits into
getsentry:master
Choose a base branch
from
dylanpulver:fix/query-param-matcher-sequence-values
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.
+109
−4
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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
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
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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -464,6 +464,71 @@ def run(): | |||||
| assert_reset() | ||||||
|
|
||||||
|
|
||||||
| @pytest.mark.parametrize( | ||||||
| "expected_query_params", | ||||||
| [ | ||||||
| {"ids": [1, 2]}, | ||||||
| {"ids": (1, 2)}, | ||||||
| {"ids": ["a", 2], "page": 1}, | ||||||
|
markstory marked this conversation as resolved.
|
||||||
| {"ids": [1, 2], "attrs": {"counter": 3, "favorites": [1, 2]}}, | ||||||
| {"ids": [1]}, | ||||||
| {"ids": ("a",)}, | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we also have a case for
Suggested change
Currently this fails with |
||||||
| ], | ||||||
| ) | ||||||
| def test_query_params_sequences(expected_query_params): # type: ignore[misc] | ||||||
| """A ``params`` value may be a sequence, which sends the key repeatedly. | ||||||
|
|
||||||
| A mapping counts as one: ``requests`` iterates it, so only its keys are | ||||||
| sent. | ||||||
| """ | ||||||
|
|
||||||
| @responses.activate | ||||||
| def run(): | ||||||
| responses.add( | ||||||
| responses.GET, | ||||||
| "https://example.com/", | ||||||
| match=[ | ||||||
| matchers.query_param_matcher(expected_query_params), | ||||||
| ], | ||||||
| ) | ||||||
| requests.get("https://example.com", params=expected_query_params) | ||||||
|
|
||||||
| run() | ||||||
| assert_reset() | ||||||
|
|
||||||
|
|
||||||
| @pytest.mark.parametrize( | ||||||
| "expected_query_params", | ||||||
| [ | ||||||
| {"ids": [[1, 2], [3]]}, | ||||||
| {"ids": [[1, 2]], "page": 1}, | ||||||
| {"ids": [1, None]}, | ||||||
| {"ids": [None, "a", 2]}, | ||||||
| ], | ||||||
| ) | ||||||
| def test_query_params_nested_sequences(expected_query_params): # type: ignore[misc] | ||||||
| """``requests`` flattens a nested sequence and drops a ``None`` element. | ||||||
|
|
||||||
| ``urlencode(..., doseq=True)`` splices a sequence inside a sequence value | ||||||
| into the query string one level deep, and ``requests`` omits a ``None`` | ||||||
| element entirely, so both are normalized the same way here. | ||||||
| """ | ||||||
|
|
||||||
| @responses.activate | ||||||
| def run(): | ||||||
| responses.add( | ||||||
| responses.GET, | ||||||
| "https://example.com/", | ||||||
| match=[ | ||||||
| matchers.query_param_matcher(expected_query_params), | ||||||
| ], | ||||||
| ) | ||||||
| requests.get("https://example.com", params=expected_query_params) | ||||||
|
|
||||||
| run() | ||||||
| assert_reset() | ||||||
|
|
||||||
|
|
||||||
| def test_query_param_matcher_does_not_mutate_input(): | ||||||
| """query_param_matcher must not modify the caller's params dict. | ||||||
|
|
||||||
|
|
||||||
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.
Nested None not stringified
Low Severity
When
_normalizeflattens a nested sequence, each item goes through_stringify, which only convertsintandfloat. ANoneinside that nested sequence staysNone, whileurlencodewithdoseqemits the string'None', so the matcher misses a request built from the same params dict.Additional Locations (1)
responses/matchers.py#L224-L226Reviewed by Cursor Bugbot for commit 264057f. Configure here.
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.
Seems like a relevant gap.