summaryrefslogtreecommitdiff
path: root/pytest.ini
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2019-05-13 13:13:36 -0600
committerCharles Harris <charlesr.harris@gmail.com>2019-05-13 13:48:22 -0600
commit81fe94de6e2261ba75c65233ba8dfbae7180640d (patch)
treee7ca3a2a6a169bcd4ca8542fc3e53f3911970246 /pytest.ini
parent4ad33d21b1a30f931e23307e9f9355b70f633bed (diff)
downloadnumpy-81fe94de6e2261ba75c65233ba8dfbae7180640d.tar.gz
TST: Register markers in conftest.py.
Register the markers 'slow' and 'valgrind' in the `conftest.py` file instead of `pytest.ini` as the latter file is not always present.
Diffstat (limited to 'pytest.ini')
-rw-r--r--pytest.ini4
1 files changed, 0 insertions, 4 deletions
diff --git a/pytest.ini b/pytest.ini
index 1ddfb6009..4748e3575 100644
--- 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