Merge de26323 into 00cd6e9

plone · Feb 12, 2020 · e3ce3c8 · e3ce3c8
2 parents 00cd6e9 + de26323
commit e3ce3c8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/src/plone/testing/publisher.rst b/src/plone/testing/publisher.rst
@@ -111,7 +111,7 @@ Here, we need to do it manually.::
 
 Layer tear-down does nothing.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.publisher.PublisherDirectives in ... seconds.
     Tear down plone.testing.zca.ZCMLDirectives in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.

diff --git a/src/plone/testing/security.rst b/src/plone/testing/security.rst
@@ -67,7 +67,7 @@ We still have the checker after test tear-down:::
 
 However, when we tear down the layer, the checker is gone:::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.security.Checkers in ... seconds.
 
     >>> getCheckerForInstancesOf(DummyObject) is None

diff --git a/src/plone/testing/zca.rst b/src/plone/testing/zca.rst
@@ -75,7 +75,7 @@ On test tear-down, this disappears.::
 
 Layer tear-down does nothing.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zca.UnitTesting in ... seconds.
 
 Event testing
@@ -136,7 +136,7 @@ On test tear-down, the list is emptied again:::
 
 Layer tear-down does nothing.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zca.EventTesting in ... seconds.
     Tear down plone.testing.zca.UnitTesting in ... seconds.
 
@@ -201,7 +201,7 @@ Let's now simulate a test. Test setup and tear-down does nothing.::
 
 On tear-down, the registry is cleaned again.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
 
     >>> queryUtility(Interface, name="test-dummy") is None
@@ -264,7 +264,7 @@ Note that normally, we'd combine this with the ``UNIT_TESTING`` layer to tear do
 
 Layer tear-down deletes the configuration context.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zca.ZCMLDirectives in ... seconds.
 
     >>> zca.ZCML_DIRECTIVES.get('configurationContext', None) is None

diff --git a/src/plone/testing/zodb.rst b/src/plone/testing/zodb.rst
@@ -79,7 +79,7 @@ The transaction has been rolled back.::
 
 Layer tear-down closes and deletes the database.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zodb.EmptyZODB in ... seconds.
 
     >>> zodb.EMPTY_ZODB.get('zodbDB', None) is None
@@ -162,7 +162,7 @@ The transaction has been rolled back.::
 
 Layer tear-down closes and deletes the database.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down PopulatedZODB in ... seconds.
 
     >>> POPULATED_ZODB.get('zodbDB', None) is None
@@ -258,7 +258,7 @@ The transaction has been rolled back.::
 
 We'll now tear down the expanded layer and inspect the database again.::
 
-    >>> runner.tear_down_unneeded(options, [POPULATED_ZODB], setupLayers)
+    >>> runner.tear_down_unneeded(options, [POPULATED_ZODB], setupLayers, [])
     Tear down ExpandedZODB in ... seconds.
 
     >>> conn = EXPANDED_ZODB['zodbDB'].open()
@@ -269,7 +269,7 @@ We'll now tear down the expanded layer and inspect the database again.::
 
 Finally, we'll tear down the rest of the layers.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down PopulatedZODB in ... seconds.
 
     >>> EXPANDED_ZODB.get('zodbDB', None) is None

diff --git a/src/plone/testing/zope.py b/src/plone/testing/zope.py
@@ -647,7 +647,6 @@ def setUpZCML(self):
     xmlns:meta="http://namespaces.zope.org/meta">
 
     <include package="Products.Five" />
-    <meta:redefinePermission from="zope2.Public" to="zope.Public" />
 
     <securityPolicy component="AccessControl.security.SecurityPolicy" />
 

diff --git a/src/plone/testing/zope.rst b/src/plone/testing/zope.rst
@@ -152,7 +152,7 @@ That is left up to the ``INTEGRATION_TESTING`` and ``FUNCTIONAL_TESTING`` layers
 
 Layer tear-down resets the environment.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zope.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
 
@@ -266,7 +266,7 @@ On tear-down, the transaction is rolled back:::
 
 Let's tear down the layers:::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zope.IntegrationTesting in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
@@ -336,7 +336,7 @@ On tear-down, the database is torn down.::
 
 Let's tear down the layer:::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zope.FunctionalTesting in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
@@ -427,7 +427,7 @@ On tear-down, the database is torn down.::
 
 Let's tear down the layer:::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zope.FunctionalTesting in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
@@ -517,7 +517,7 @@ Test tear-down does nothing beyond what the base layers do.::
 
 When the server is torn down, the WSGIServer thread is stopped.::
 
-    >>> runner.tear_down_unneeded(options, [], setupLayers)
+    >>> runner.tear_down_unneeded(options, [], setupLayers, [])
     Tear down plone.testing.zope.WSGIServer:Functional in ... seconds.
     Tear down plone.testing.zope.WSGIServer in ... seconds.
     Tear down plone.testing.zope.Startup in ... seconds.