summaryrefslogtreecommitdiff
path: root/sphinx
diff options
context:
space:
mode:
authoroleg.hoefling <oleg.hoefling@gmail.com>2020-10-08 17:08:18 +0200
committeroleg.hoefling <oleg.hoefling@gmail.com>2020-10-25 11:29:59 +0100
commit35725f02d9fc42d711d8a377fd97e07aa8015958 (patch)
treee9cf4a36ad3066c83d863d2fc16351871120626c /sphinx
parentad7c09ef10038c6147f373f1edf8db2c5e2160d1 (diff)
downloadsphinx-git-35725f02d9fc42d711d8a377fd97e07aa8015958.tar.gz
move registration of public markers to sphinx.testing.fixtures
Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
Diffstat (limited to 'sphinx')
-rw-r--r--sphinx/testing/fixtures.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py
index 9197014bf..cacbb04bf 100644
--- a/sphinx/testing/fixtures.py
+++ b/sphinx/testing/fixtures.py
@@ -22,6 +22,21 @@ from sphinx.testing import util
from sphinx.testing.util import SphinxTestApp, SphinxTestAppWrapperForSkipBuilding
+markers = [
+ (
+ 'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None,'
+ ' docutilsconf=None, parallel=0): arguments to initialize the sphinx test application.'
+ ),
+ 'test_params(shared_result=...): test parameters.',
+]
+
+
+def pytest_configure(config):
+ # register custom markers
+ for marker in markers:
+ config.addinivalue_line('markers', marker)
+
+
@pytest.fixture(scope='session')
def rootdir() -> str:
return None