WIP support pytest 8.x.

src/zope/pytestlayer/doctest.py

@@ -20,6 +20,28 @@ def tearDown(self):
 NOOP_LAYER = NoOpLayer()
 
 
+class PatchedDocTestSuite:
+
+    def __init__(self, suite):
+        self._suite = suite
+
+    def __call__(self, *args, **kw):
+        result = None
+        if args:
+            if not isinstance(args[0], str):
+                result = args[0]
+        return self.run(result)
+
+    def __getattr__(self, name):
+        return getattr(self._suite, name)
+
+    def __setattr__(self, name, value):
+        if name == '_suite':
+            self.__dict__[name] = value
+        else:
+            setattr(self._suite, name, value)
+
+
 def DocTestSuite(*args, **kw):
     """A DocTestSuite whose tests are detectable by zope.pytestlayer.
 
@@ -28,4 +50,11 @@ def DocTestSuite(*args, **kw):
     layer = kw.pop('layer', NOOP_LAYER)
     suite = doctest.DocTestSuite(*args, **kw)
     suite.layer = layer
-    return suite
+    return PatchedDocTestSuite(suite)
+
+
+def layered(suite, layer=NOOP_LAYER):
+    """XXX
+    """
+    suite.layer = layer
+    return PatchedDocTestSuite(suite)

src/zope/pytestlayer/tests/fixture/single_layered_suite/test_core.py

@@ -1,8 +1,7 @@
 import doctest
 import unittest
 
-from plone.testing import layered
-
+from zope.pytestlayer.doctest import layered
 from zope.pytestlayer.testing import log_to_terminal
 
 

src/zope/pytestlayer/tests/test_integration.py

@@ -147,7 +147,7 @@ def test_single_layer_in_two_modules(where):
 
 def test_single_layered_suite(where):
     lines = run_pytest('single_layered_suite')
-    assert """\
+    assert join(lines) == """\
 plugins: zope.pytestlayer
 collecting ... collected 1 item
 src/zope/pytestlayer/tests/fixture/single_layered_suite/test_core.py <- test_suite: /src/zope/pytestlayer/tests/fixture/single_layered_suite/doctest.txt single_layered_suite.test_core.FooLayer
@@ -156,7 +156,7 @@ def test_single_layered_suite(where):
 src/zope/pytestlayer/tests/fixture/single_layered_suite/test_core.py <- test_suite: /src/zope/pytestlayer/tests/fixture/single_layered_suite/doctest.txt PASSED
 testTearDown foo
 Tear down single_layered_suite.test_core.FooLayer in N.NNN seconds.
-""" == join(lines)
+"""
     assert '=== 1 passed' in lines[-1]