summaryrefslogtreecommitdiff
path: root/numpy/conftest.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/conftest.py')
-rw-r--r--numpy/conftest.py7
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):