TST: Fix largescale pytest mark issue #1553
Merged
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
We change the command-line option to a version recommended in the pytest docs: https://docs.pytest.org/en/latest/example/markers.html#custom-marker-and-command-line-option-to-control-test-runs - A global `suite(name)` mark is registered, that takes a name and marks a test as belonging to a specific suite. - These special suites are opt-in, i.e., not run by default. - To enable a suite, one adds `-S name` to the pytest command-line options. - Since function-scoped fixtures are handled stricter now, the workaround in tensors_test.py didn't work any longer (see pytest-dev/pytest#6497). - We thus set the minimum pytest version to 5.4.0, where the fix for the issue is implemented. Closes: odlgroup#1514
adler-j
approved these changes
Apr 15, 2020
| @@ -279,4 +282,4 @@ def test_proximal_convex_conj_kl_cross_entropy_solving_opt_problem(): | |||
|
|
|||
|
|
|||
| if __name__ == '__main__': | |||
| odl.util.test_file(__file__, ['--largescale']) | |||
| odl.util.test_file(__file__, ['-S', 'largescale']) | |||
There was a problem hiding this comment.
Shouldn't '-S largescale' be more appropriate?
There was a problem hiding this comment.
That's indeed how you give it on the command line. Here it's just a list of arguments to the call, and from what I've seen it's more common to give it in "already pre-parsed" form, i.e., each argument as a separate element of the list.
|
|
||
|
|
||
| @pytest.mark.skipif("not pytest.config.getoption('--doctest-doc')", | ||
| reason='Need --doctest-doc option to run') | ||
| @pytest.mark.suite("doc_doctests") | ||
| def test_file(doc_src_file): | ||
| # FIXXXME: This doesn't seem to actually test the file :-( |
| @@ -8,21 +8,30 @@ | |||
|
|
|||
| """Test configuration file.""" | |||
|
|
|||
| from __future__ import print_function, division, absolute_import | |||
| import numpy as np | |||
| from __future__ import absolute_import, division, print_function | |||
There was a problem hiding this comment.
Unrelated, but python 2 is no longer supported by the community. We could remove support for it in ODL.
There was a problem hiding this comment.
Yes definitely. I'll make an issue for that. Perhaps it's okay to say "this is the last commit that supports Python 2", rather than crafting a release for it.
kohr-h
added
status: in revision
and removed
status: review needed
status: in revision
labels
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.
We change the command-line option to a version recommended in
the pytest docs:
https://docs.pytest.org/en/latest/example/markers.html#custom-marker-and-command-line-option-to-control-test-runs
suite(name)mark is registered, that takes aname and marks a test as belonging to a specific suite.
-S nameto the pytestcommand-line options.
the workaround in tensors_test.py didn't work any longer
(see Fixture fails with "module" scope and numpy array as value pytest-dev/pytest#6497).
fix for the issue is implemented.
Closes: #1514