Fix tests in Sphinx 8.1+

Author: AWhetter

docs/changes/+6dd7e9f4.misc.rst

@@ -0,0 +1 @@
+Fix tests in Sphinx 8.1+

tests/python/conftest.py

@@ -9,7 +9,7 @@
 
 @pytest.fixture(scope="session")
 def rebuild():
-    def _rebuild(confdir=".", **kwargs):
+    def _rebuild(confdir=".", **kwargs) -> int:
         app = Sphinx(
             srcdir=".",
             confdir=confdir,
@@ -20,6 +20,7 @@ def _rebuild(confdir=".", **kwargs):
             **kwargs,
         )
         app.build()
+        return app.statuscode
 
     return _rebuild
 
@@ -28,7 +29,7 @@ def _rebuild(confdir=".", **kwargs):
 def builder(rebuild):
     cwd = os.getcwd()
 
-    def build(test_dir, **kwargs):
+    def build(test_dir, **kwargs) -> int:
         if kwargs.get("warningiserror"):
             # Add any warnings raised when using `Sphinx` more than once
             # in a Python session.
@@ -40,7 +41,7 @@ def build(test_dir, **kwargs):
             suppress.append("app.add_role")
 
         os.chdir(f"tests/python/{test_dir}")
-        rebuild(**kwargs)
+        return rebuild(**kwargs)
 
     yield build
 

tests/python/test_pyintegration.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import pathlib
 import sys
@@ -1305,11 +1306,18 @@ def test_line_number_order(self, parse):
         assert method_tricky.sourceline < method_sphinx_docs.sourceline
 
 
-def test_nothing_to_render_raises_warning(builder):
-    with pytest.raises(sphinx.errors.SphinxWarning) as exc_info:
-        builder("pynorender", warningiserror=True)
+def test_nothing_to_render_raises_warning(builder, caplog):
+    caplog.set_level(logging.WARNING, logger="autoapi._mapper")
+    if sphinx_version >= (8, 1):
+        status = builder("pynorender", warningiserror=True)
+        assert status
+    else:
+        with pytest.raises(sphinx.errors.SphinxWarning):
+            builder("pynorender", warningiserror=True)
 
-    assert "No modules were rendered" in str(exc_info.value)
+    assert any(
+        "No modules were rendered" in record.message for record in caplog.records
+    )
 
 
 class TestStdLib: