diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2019-08-19 19:16:44 -0500 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2019-08-19 19:16:44 -0500 |
| commit | 0f5e376d3eb6118b783cdd3ecd27722c2d1934ba (patch) | |
| tree | c44850b579cbd27993c45dda1a7922e2d109b24f /numpy/conftest.py | |
| parent | 483f565d85dadc899f94710531fba8355d554d59 (diff) | |
| parent | 98bdde643af6443d68a8c6233807b75bd3f0ed80 (diff) | |
| download | numpy-0f5e376d3eb6118b783cdd3ecd27722c2d1934ba.tar.gz | |
Merge remote-tracking branch 'upstream/master' into fix-if-fields
Diffstat (limited to 'numpy/conftest.py')
| -rw-r--r-- | numpy/conftest.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/numpy/conftest.py b/numpy/conftest.py index 4d4d055ec..18d5d1ce9 100644 --- a/numpy/conftest.py +++ b/numpy/conftest.py @@ -13,6 +13,15 @@ _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", + "leaks_references: Tests that are known to leak references.") + config.addinivalue_line("markers", + "slow: Tests that are very slow.") + + #FIXME when yield tests are gone. @pytest.hookimpl() def pytest_itemcollected(item): |