Organise tests into directories

Author: AA-Turner

.ruff.toml

@@ -510,8 +510,8 @@ select = [
 ]
 
 # these tests need old ``typing`` generic aliases
-"tests/test_util_typing.py" = ["UP006", "UP035"]
-"tests/typing_test_data.py" = ["FA100", "UP006", "UP035"]
+"tests/test_util/test_util_typing.py" = ["UP006", "UP035"]
+"tests/test_util/typing_test_data.py" = ["FA100", "UP006", "UP035"]
 
 "utils/*" = [
     "T201",  # whitelist ``print`` for stdout messages
@@ -520,3 +520,8 @@ select = [
 
 [lint.flake8-quotes]
 inline-quotes = "single"
+
+[lint.isort]
+forced-separate = [
+    "tests",
+]

sphinx/testing/fixtures.py

@@ -19,8 +19,8 @@
 
 DEFAULT_ENABLED_MARKERS = [
     (
-        'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None,'
-        ' docutilsconf=None, parallel=0): arguments to initialize the sphinx test application.'
+        'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None, '
+        'docutils_conf=None, parallel=0): arguments to initialize the sphinx test application.'
     ),
     'test_params(shared_result=...): test parameters.',
 ]

sphinx/testing/util.py

@@ -10,10 +10,8 @@
 from xml.etree import ElementTree
 
 from docutils import nodes
-from docutils.parsers.rst import directives, roles
 
-from sphinx import application, locale
-from sphinx.pycode import ModuleAnalyzer
+from sphinx import application
 
 if TYPE_CHECKING:
     from io import StringIO
@@ -89,14 +87,14 @@ def __init__(
         status: IO | None = None,
         warning: IO | None = None,
         tags: list[str] | None = None,
-        docutilsconf: str | None = None,
+        docutils_conf: str | None = None,
         parallel: int = 0,
     ) -> None:
         assert srcdir is not None
 
         self.docutils_conf_path = srcdir / 'docutils.conf'
-        if docutilsconf is not None:
-            self.docutils_conf_path.write_text(docutilsconf, encoding='utf8')
+        if docutils_conf is not None:
+            self.docutils_conf_path.write_text(docutils_conf, encoding='utf8')
 
         if builddir is None:
             builddir = srcdir / '_build'
@@ -108,35 +106,32 @@ def __init__(
         doctreedir.mkdir(parents=True, exist_ok=True)
         if confoverrides is None:
             confoverrides = {}
-        warningiserror = False
 
         self._saved_path = sys.path.copy()
-        self._saved_directives = directives._directives.copy()  # type: ignore[attr-defined]
-        self._saved_roles = roles._roles.copy()  # type: ignore[attr-defined]
-
-        self._saved_nodeclasses = {v for v in dir(nodes.GenericNodeVisitor)
-                                   if v.startswith('visit_')}
 
         try:
-            super().__init__(srcdir, confdir, outdir, doctreedir,
-                             buildername, confoverrides, status, warning,
-                             freshenv, warningiserror, tags, parallel=parallel)
+            super().__init__(
+                srcdir, confdir, outdir, doctreedir,
+                buildername, confoverrides, status, warning, freshenv,
+                warningiserror=False, tags=tags, parallel=parallel,
+            )
         except Exception:
             self.cleanup()
             raise
 
     def cleanup(self, doctrees: bool = False) -> None:
-        ModuleAnalyzer.cache.clear()
-        locale.translators.clear()
-        sys.path[:] = self._saved_path
-        sys.modules.pop('autodoc_fodder', None)
-        directives._directives = self._saved_directives  # type: ignore[attr-defined]
-        roles._roles = self._saved_roles  # type: ignore[attr-defined]
-        for method in dir(nodes.GenericNodeVisitor):
-            if method.startswith('visit_') and \
-               method not in self._saved_nodeclasses:
-                delattr(nodes.GenericNodeVisitor, 'visit_' + method[6:])
-                delattr(nodes.GenericNodeVisitor, 'depart_' + method[6:])
+        # ModuleAnalyzer.cache.clear()
+        # locale.translators.clear()
+        # sys.path[:] = self._saved_path
+        # sys.modules.pop('autodoc_fodder', None)
+        # directives._directives.clear()  # type: ignore[attr-defined]
+        # roles._roles.clear()  # type: ignore[attr-defined]
+        # for node in additional_nodes:
+        #     delattr(nodes.GenericNodeVisitor, f'visit_{node.__name__}')
+        #     delattr(nodes.GenericNodeVisitor, f'depart_{node.__name__}')
+        #     delattr(nodes.SparseNodeVisitor, f'visit_{node.__name__}')
+        #     delattr(nodes.SparseNodeVisitor, f'depart_{node.__name__}')
+        # additional_nodes.clear()
         with contextlib.suppress(FileNotFoundError):
             os.remove(self.docutils_conf_path)
 

tests/conftest.py

@@ -1,11 +1,16 @@
 import os
+import sys
 from pathlib import Path
 
 import docutils
 import pytest
+from docutils import nodes
+from docutils.parsers.rst import directives, roles
 
 import sphinx
 import sphinx.locale
+import sphinx.pycode
+from sphinx.util.docutils import additional_nodes
 
 
 def _init_console(locale_dir=sphinx.locale._LOCALE_DIR, catalog='sphinx'):
@@ -30,11 +35,33 @@ def _init_console(locale_dir=sphinx.locale._LOCALE_DIR, catalog='sphinx'):
 
 @pytest.fixture(scope='session')
 def rootdir():
-    return Path(__file__).parent.absolute() / 'roots'
+    return Path(__file__).parent.resolve() / 'roots'
 
 
 def pytest_report_header(config):
     header = f"libraries: Sphinx-{sphinx.__display_version__}, docutils-{docutils.__version__}"
     if hasattr(config, '_tmp_path_factory'):
         header += f"\nbase tmp_path: {config._tmp_path_factory.getbasetemp()}"
     return header
+
+
+@pytest.fixture(autouse=True)
+def _cleanup_docutils():
+    saved_path = sys.path
+    yield  # run the test
+    sys.path[:] = saved_path
+
+    # clean up Docutils global state
+    directives._directives.clear()  # type: ignore[attr-defined]
+    roles._roles.clear()  # type: ignore[attr-defined]
+    for node in additional_nodes:
+        delattr(nodes.GenericNodeVisitor, f'visit_{node.__name__}')
+        delattr(nodes.GenericNodeVisitor, f'depart_{node.__name__}')
+        delattr(nodes.SparseNodeVisitor, f'visit_{node.__name__}')
+        delattr(nodes.SparseNodeVisitor, f'depart_{node.__name__}')
+    additional_nodes.clear()
+
+    # clean up Sphinx global state
+    sphinx.locale.translators.clear()
+    sphinx.pycode.ModuleAnalyzer.cache.clear()
+    sys.modules.pop('autodoc_fodder', None)

tests/roots/test-ext-doctest-skipif/conf.py

@@ -6,7 +6,7 @@
 exclude_patterns = ['_build']
 
 doctest_global_setup = '''
-from tests.test_ext_doctest import record
+from tests.test_extensions.test_ext_doctest import record
 
 record('doctest_global_setup', 'body', True)
 '''

tests/roots/test-ext-doctest/doctest.txt

@@ -139,7 +139,7 @@ Special directives
 
 .. testcleanup:: *
 
-   from tests import test_ext_doctest
+   from tests.test_extensions import test_ext_doctest
    test_ext_doctest.cleanup_call()
 
 non-ASCII result

tests/test_builders/__init__.py

@@ -3,7 +3,6 @@
 import os
 import shutil
 from contextlib import contextmanager
-from pathlib import Path
 from unittest import mock
 
 import pytest
@@ -12,6 +11,8 @@
 from sphinx.cmd.build import build_main
 from sphinx.errors import SphinxError
 
+from tests.utils import TESTS_ROOT
+
 
 def request_session_head(url, **kwargs):
     response = mock.Mock()
@@ -63,12 +64,12 @@ def test_root_doc_not_found(tmp_path, make_app):
 
     app = make_app('dummy', srcdir=tmp_path)
     with pytest.raises(SphinxError):
-        app.builder.build_all()  # no index.rst
+        app.build(force_all=True)  # no index.rst
 
 
 @pytest.mark.sphinx(buildername='text', testroot='circular')
 def test_circular_toctree(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
     warnings = warning.getvalue()
     assert (
         'circular toctree references detected, ignoring: '
@@ -80,7 +81,7 @@ def test_circular_toctree(app, status, warning):
 
 @pytest.mark.sphinx(buildername='text', testroot='numbered-circular')
 def test_numbered_circular_toctree(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
     warnings = warning.getvalue()
     assert (
         'circular toctree references detected, ignoring: '
@@ -92,7 +93,7 @@ def test_numbered_circular_toctree(app, status, warning):
 
 @pytest.mark.sphinx(buildername='dummy', testroot='images')
 def test_image_glob(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
 
     # index.rst
     doctree = app.env.get_doctree('index')
@@ -155,7 +156,7 @@ def force_colors():
 def test_log_no_ansi_colors(tmp_path):
     with force_colors():
         wfile = tmp_path / 'warnings.txt'
-        srcdir = Path(__file__).parent / 'roots/test-nitpicky-warnings'
+        srcdir = TESTS_ROOT / 'roots' / 'test-nitpicky-warnings'
         argv = list(map(str, ['-b', 'html', srcdir, tmp_path, '-n', '-w', wfile]))
         retcode = build_main(argv)
         assert retcode == 0