Merge pull request #13552 from charris/register-markers

charris · web-flow · commit 1b5b0b4306f1 · 2019-05-13T16:58:44.000-07:00
TST: Register markers in conftest.py.
diff --git a/numpy/conftest.py b/numpy/conftest.py
@@ -13,6 +13,13 @@
 _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):
diff --git a/pytest.ini b/pytest.ini
@@ -24,7 +24,3 @@ filterwarnings =
 
 env =
     PYTHONHASHSEED=0
-
-markers =
-    valgrind_error: Known to cause errors under valgrind
-    slow: Tests which are slow
