py38: replace invalid assertRaises kwargs with simpler assertRaisesMessage #28696
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
…django instead (cherry picked from commit 289a922)
…e which still has assertRaisesMessage also this regex isn't correct and always passes, lol
joshuarli
commented
Sep 20, 2021
| @@ -384,12 +384,15 @@ def test_allowed_keys(self): | |||
| ] | |||
|
|
|||
| def test_invalid_aggregate_column_with_duration_filter(self): | |||
| with self.assertRaises(InvalidSearchQuery, regex="not a duration column"): | |||
There was a problem hiding this comment.
This regex= was always broken, on 3.6 you can change it to "foo" and it still passes, lol.
If you change it to the correct self.assertRaisesRegexp(InvalidSearchQuery, expected_regex="foo"):
E AssertionError: "foo" does not match "avg(stack.colno):
column argument invalid: stack.colno is not a numeric column"
wedamija
approved these changes
Sep 20, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
In Python 3.8, regex and expected_regex are invalid kwargs to assertRaises. django.test.SimpleTestCase has a simpler and faster assertRaisesMessage - we already have that in our base TestCase but for tests that are using unittest.TestCase, can just use SimpleTestCase.