fixes for Zope 4.2.1

plone · Feb 11, 2020 · 78514da · 78514da
1 parent d0a6bdd
commit 78514da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/plone/app/testing/helpers.rst b/src/plone/app/testing/helpers.rst
@@ -237,7 +237,7 @@ We'll now tear down just the ``HELPER_DEMOS_INTEGRATION_TESTING`` layer. At this
 point, we should still have a Plone site, but none of the persistent or
 component architecture changes from our layer.
 
-    >>> runner.tear_down_unneeded(options, [l for l in setupLayers if l not in (HELPER_DEMOS_INTEGRATION_TESTING, HELPER_DEMOS_FIXTURE,)], setupLayers)
+    >>> runner.tear_down_unneeded(options, [l for l in setupLayers if l not in (HELPER_DEMOS_INTEGRATION_TESTING, HELPER_DEMOS_FIXTURE,)], setupLayers, [])
     Tear down plone.app.testing.layers.HelperDemos:Integration in ... seconds.
     Tear down...HelperDemos in ... seconds.
 
@@ -254,7 +254,7 @@ component architecture changes from our layer.
 
 Let's tear down the rest of the layers too.
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.app.testing.layers.PloneFixture in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
@@ -397,7 +397,7 @@ We'll now tear down just the ``MY_INTEGRATION_TESTING`` layer. At this
 point, we should still have a Plone site, but none of the changes from our
 layer.
 
-    >>> runner.tear_down_unneeded(options, [l for l in setupLayers if l not in (MY_INTEGRATION_TESTING, MY_FIXTURE)], setupLayers)
+    >>> runner.tear_down_unneeded(options, [l for l in setupLayers if l not in (MY_INTEGRATION_TESTING, MY_FIXTURE)], setupLayers, [])
     Tear down plone.app.testing.layers.MyLayer:Integration in ... seconds.
 
     >>> queryUtility(Interface, name="dummy1") is None
@@ -436,7 +436,7 @@ layer.
 
 Let's tear down the rest of the layers too.
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.app.testing.layers.PloneFixture in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.

diff --git a/src/plone/app/testing/layers.rst b/src/plone/app/testing/layers.rst
@@ -98,7 +98,7 @@ There is no default workflow or content:
 
 Layer tear-down resets the environment.
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.app.testing.layers.PloneFixture in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
@@ -186,7 +186,7 @@ And the component site has been reset:
 
 Layer tear-down resets the environment.
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.app.testing.layers.Plone:Integration in ... seconds.
     Tear down plone.app.testing.layers.PloneFixture in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.
@@ -266,7 +266,7 @@ Along with the rest of the state:
 
 Layer tear-down resets the environment.
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.app.testing.layers.Plone:Functional in ... seconds.
     Tear down plone.app.testing.layers.PloneFixture in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.
@@ -367,7 +367,7 @@ Test tear-down does nothing beyond what the base layers do.
 
 When the server is torn down, the ZServer thread is stopped.
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.app.testing.layers.Plone:WSGIServer in ... seconds.
     Tear down plone.testing.zope.WSGIServer in ... seconds.
     Tear down plone.app.testing.layers.PloneFixture in ... seconds.
@@ -469,7 +469,7 @@ When the test is torn down the original MaiHost is restored:
     ...
     AttributeError: 'RequestContainer' object has no attribute 'messages'
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.app.testing.layers.MockMailHostLayer in ... seconds.
     Tear down plone.app.testing.layers.PloneFixture in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.