TST: simplify how the different code paths for block are tested. #12259
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
eric-wieser
reviewed
Oct 24, 2018
numpy/core/tests/test_shape_base.py
Outdated
| dict(block=_block_force_concatenate), | ||
| dict(block=_block_force_slicing)] | ||
| @pytest.fixture(params=['block', 'force_concatenate', 'force_slicing']) | ||
| def block(request): # maybe needs self, not sure |
There was a problem hiding this comment.
Assuming this works, should strip this comment out
There was a problem hiding this comment.
man, what a mistake!
623da56 to
75e0e75
Compare
75e0e75 to
ce55462
Compare
|
@eric-wieser I finally got around to fixing this. I'm glad I was explicit about my tests since it was always falling down to the default case. We needed the |
eric-wieser
approved these changes
Nov 5, 2018
eric-wieser
reviewed
Nov 5, 2018
| elif request.param == 'force_slicing': | ||
| return _block_force_slicing | ||
| elif request.param == 'block': | ||
| return block |
There was a problem hiding this comment.
Note you could also achieve this via the ids parameter to fixture:
@pytest.fixture(
params=[block, _block_force_concatenate, _block_force_slicing],
ids=['block', 'force_concatenate', 'force_slicing']
)
Which has the benefit of not needing the final else.
Not really a big deal either way.
There was a problem hiding this comment.
that else statement is more a test on the test. It checks that I know how to use request (which I didn't).
|
Thanks for the review @eric-wieser |
|
Thanks @hmaarrfk . |
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.
xref: #11971 (comment)
cc: @eric-wieser