summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorStephen Finucane <stephen@that.guru>2017-10-26 16:59:46 +0100
committerStephen Finucane <stephen@that.guru>2017-12-18 20:10:18 +0000
commitc8d56236c9286adca9664782debf3b1c768ef92d (patch)
tree0e33befd0a96f74beb91fe63ff20d336b8a98ba0 /tests/conftest.py
parente243e827236467b67b057b83131248ef1742aacb (diff)
downloadsphinx-git-c8d56236c9286adca9664782debf3b1c768ef92d.tar.gz
tests: Ignore roots using 'collect_ignore'
This is slightly cleaner than how we're doing this at the moment. Signed-off-by: Stephen Finucane <stephen@that.guru>
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index c9719bf80..9ea99dbd9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -15,9 +15,12 @@ from sphinx.testing.path import path
pytest_plugins = 'sphinx.testing.fixtures'
+# Exclude 'roots' dirs for pytest test collector
+collect_ignore = ['roots']
+
# Disable Python version-specific
if sys.version_info < (3, 5):
- collect_ignore = ['py35']
+ collect_ignore += ['py35']
@pytest.fixture(scope='session')