diff options
| author | Matti Picus <matti.picus@gmail.com> | 2019-05-13 15:39:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-13 15:39:35 -0700 |
| commit | 8970dc8e588776bbae45953b2809883c4b6f8ed0 (patch) | |
| tree | ab9bc5c54ad92b86326609e0c13ed0ac1076e712 /numpy/conftest.py | |
| parent | ff894ae7777cf5d2598f807707dc8f81bcb1f25f (diff) | |
| parent | 81fe94de6e2261ba75c65233ba8dfbae7180640d (diff) | |
| download | numpy-8970dc8e588776bbae45953b2809883c4b6f8ed0.tar.gz | |
Merge pull request #13550 from charris/register-markers
TST: Register markers in conftest.py.
Diffstat (limited to 'numpy/conftest.py')
| -rw-r--r-- | numpy/conftest.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/numpy/conftest.py b/numpy/conftest.py index 4d4d055ec..7834dd39d 100644 --- a/numpy/conftest.py +++ b/numpy/conftest.py @@ -13,6 +13,13 @@ _old_fpu_mode = None _collect_results = {} +def pytest_configure(config): + config.addinivalue_line("markers", + "valgrind_error: Tests that are known to error under valgrind.") + config.addinivalue_line("markers", + "slow: Tests that are very slow.") + + #FIXME when yield tests are gone. @pytest.hookimpl() def pytest_itemcollected(item): |