diff options
| author | oleg.hoefling <oleg.hoefling@gmail.com> | 2020-10-08 17:08:18 +0200 |
|---|---|---|
| committer | oleg.hoefling <oleg.hoefling@gmail.com> | 2020-10-25 11:29:59 +0100 |
| commit | 35725f02d9fc42d711d8a377fd97e07aa8015958 (patch) | |
| tree | e9cf4a36ad3066c83d863d2fc16351871120626c | |
| parent | ad7c09ef10038c6147f373f1edf8db2c5e2160d1 (diff) | |
| download | sphinx-git-35725f02d9fc42d711d8a377fd97e07aa8015958.tar.gz | |
move registration of public markers to sphinx.testing.fixtures
Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | sphinx/testing/fixtures.py | 15 |
2 files changed, 15 insertions, 2 deletions
@@ -57,10 +57,8 @@ filterwarnings = ignore::DeprecationWarning:pyximport.pyximport ignore::PendingDeprecationWarning:sphinx.util.pycompat markers = - sphinx apidoc setup_command - test_params testpaths = tests [coverage:run] 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 |