diff options
| author | Matti Picus <matti.picus@gmail.com> | 2019-05-19 09:34:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 09:34:58 +0300 |
| commit | ecb402499dba2d105b2714a55259352c31a62bd5 (patch) | |
| tree | bcf388f945fc2eb9d4c151f776e030a65fb7fed7 /numpy/conftest.py | |
| parent | db595a0c4064956d2f2f904ed4a76443322bb7e9 (diff) | |
| parent | 7495de475c8c578a0c39b09bc55a88a93aa1985a (diff) | |
| download | numpy-ecb402499dba2d105b2714a55259352c31a62bd5.tar.gz | |
Merge branch 'master' into npy-2.1
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): |