add match to bare pyteset.raises() - arrays #33010
Merged
Conversation
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
@sathyz Can you please change the word "closes" to the word "ref"? |
ShaharNaveh
reviewed
Mar 25, 2020
| @@ -57,7 +57,7 @@ def test_overlaps_interval_container(self, constructor, other_constructor): | |||
| # TODO: modify this test when implemented | |||
| interval_container = constructor.from_breaks(range(5)) | |||
| other_container = other_constructor.from_breaks(range(5)) | |||
| with pytest.raises(NotImplementedError): | |||
| with pytest.raises(NotImplementedError, match=None): | |||
There was a problem hiding this comment.
Suggested change
| with pytest.raises(NotImplementedError, match=None): | |
| with pytest.raises(NotImplementedError, match="^$"): |
ShaharNaveh
reviewed
Mar 25, 2020
Comment on lines
798
to
813
| msg = ( | ||
| r"'value' should be a 'Timestamp', 'NaT', or array of those. " | ||
| r"Got 'timedelta64' instead.|" | ||
| r"'value' should be a 'Timedelta', 'NaT', or array of those. " | ||
| r"Got 'datetime64' instead.|" | ||
| r"'value' should be a 'Timedelta', 'NaT', or array of those. " | ||
| r"Got 'int' instead.|" | ||
| r"'value' should be a 'Timestamp', 'NaT', or array of those. " | ||
| r"Got 'int' instead.|" | ||
| r"'value' should be a 'Period', 'NaT', or array of those. " | ||
| r"Got 'datetime64' instead.|" | ||
| r"'value' should be a 'Period', 'NaT', or array of those. " | ||
| r"Got 'timedelta64' instead.|" | ||
| r"'value' should be a 'Period', 'NaT', or array of those. " | ||
| r"Got 'int' instead." | ||
| ) |
There was a problem hiding this comment.
We are trying to use the pattern of:
msg = "|".join(
[
"foo",
"bar,
"baz"
]
)There was a problem hiding this comment.
After having a second look, I think we can have this as a single string
Suggested change
| msg = ( | |
| r"'value' should be a 'Timestamp', 'NaT', or array of those. " | |
| r"Got 'timedelta64' instead.|" | |
| r"'value' should be a 'Timedelta', 'NaT', or array of those. " | |
| r"Got 'datetime64' instead.|" | |
| r"'value' should be a 'Timedelta', 'NaT', or array of those. " | |
| r"Got 'int' instead.|" | |
| r"'value' should be a 'Timestamp', 'NaT', or array of those. " | |
| r"Got 'int' instead.|" | |
| r"'value' should be a 'Period', 'NaT', or array of those. " | |
| r"Got 'datetime64' instead.|" | |
| r"'value' should be a 'Period', 'NaT', or array of those. " | |
| r"Got 'timedelta64' instead.|" | |
| r"'value' should be a 'Period', 'NaT', or array of those. " | |
| r"Got 'int' instead." | |
| ) | |
| msg = ( | |
| "'value' should be a '(Timestamp|Timedelta|Period)', 'NaT', or array of those. " | |
| "Got '(timedelta64|datetime64|int)' instead." | |
| ) |
There was a problem hiding this comment.
assertions fail when I use this,
E AssertionError: Pattern "'value' should be a '(Timestamp|Timedelta|Period)','NaT', or array of those. Got '(timedelta64|datetime64|int)' instead." not found in "'value' should be a 'Timedelta', 'NaT', or array of those. Got 'datetime64' instead."
I'm trying to investigate as follows,
>>> import re
>>> msg = "'value' should be a 'Timedelta', 'NaT', or array of those. Got 'datetime64' instead."
>>> pat = r"'value' should be a '(Timestamp|Timedelta|Period)', 'NaT', or array of those. Got '(timedelta64|datetimee64|int)' instead."
>>> re.search(pat, msg)
>>>
There was a problem hiding this comment.
it looks like missing a space after comma
ShaharNaveh
added
the
Testing
| @@ -108,14 +108,20 @@ def test_take_fill(self): | |||
| result = arr.take([-1, 1], allow_fill=True, fill_value=pd.NaT) | |||
| assert result[0] is pd.NaT | |||
|
|
|||
| with pytest.raises(ValueError): | |||
| arr.take([0, 1], allow_fill=True, fill_value=2) | |||
| value = 2 | |||
There was a problem hiding this comment.
can you split this out from test_take_fill as a separate test, say test_take_fill_raises and parametrize over value.
21 tasks
|
thanks @sathyz |
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.
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diff