Merge pull request #20 from plone/thet-zope4

Zope4
plone · Jan 29, 2016 · bc0589f · bc0589f
2 parents 3ef13fa + 85d8f5c
commit bc0589f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,7 +10,11 @@ New:
 
 Fixes:
 
-- *add item here*
+- Fix ``layers.rst`` doctest to be compatible with older and newer zope.testrunner layer ordering.
+  [thet]
+
+- Depend on ``zope.testrunner`` and fix deprecated usage of ``zope.testing.testrunner``.
+  [thet]
 
 
 5.0b6 (2015-08-22)

diff --git a/plone/app/testing/helpers.rst b/plone/app/testing/helpers.rst
@@ -12,7 +12,7 @@ their canonical locations at ``plone.app.testing.helpers``.
 
 For testing, we need a testrunner
 
-    >>> from zope.testing.testrunner import runner
+    >>> from zope.testrunner import runner
 
 Let's create a custom fixture layer that exercises these helpers. In this
 layer, we will perform the following setup:

diff --git a/plone/app/testing/layers.rst b/plone/app/testing/layers.rst
@@ -9,7 +9,8 @@ their canonical locations at ``plone.app.testing.layers``.
 
 For testing, we need a testrunner
 
-    >>> from zope.testing.testrunner import runner
+    >>> from zope.testrunner import runner
+
 
 Plone site fixture
 ~~~~~~~~~~~~~~~~~~
@@ -366,9 +367,8 @@ When the server is torn down, the ZServer thread is stopped.
 
     >>> runner.tear_down_unneeded(options, [], setupLayers)
     Tear down plone.app.testing.layers.Plone:ZServer in ... seconds.
-    Tear down plone.app.testing.layers.PloneFixture in ... seconds.
-    Tear down plone.testing.z2.ZServer in ... seconds.
-    Tear down plone.testing.z2.Startup in ... seconds.
+    ...Tear down plone.app.testing.layers.PloneFixture in ... seconds.
+    ...Tear down plone.testing.z2.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
 
     >>> conn = urllib2.urlopen(portal_url + '/folder1', timeout=5)
@@ -485,9 +485,8 @@ When the server is torn down, the FTP server thread is stopped.
 
     >>> runner.tear_down_unneeded(options, [], setupLayers)
     Tear down plone.app.testing.layers.Plone:FTPServer in ... seconds.
-    Tear down plone.app.testing.layers.PloneFixture in ... seconds.
-    Tear down plone.testing.z2.FTPServer in ... seconds.
-    Tear down plone.testing.z2.Startup in ... seconds.
+    ...Tear down plone.app.testing.layers.PloneFixture in ... seconds.
+    ...Tear down plone.testing.z2.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
 
     >>> ftpClient.connect(host, port, timeout=5)

diff --git a/plone/app/testing/selenium.rst b/plone/app/testing/selenium.rst
@@ -44,7 +44,7 @@ and then kill the backgrouned process.
 
 For testing, we need a testrunner
 
-    >>> from zope.testing.testrunner import runner
+    >>> from zope.testrunner import runner
 
 The ``SELENIUM_PLONE_FUNCTIONAL_TESTING`` layer instantiates the
 ``FunctionalTesting`` class with two bases: ``SELENIUM_FIXTURE``, as

diff --git a/setup.py b/setup.py
@@ -12,6 +12,7 @@
                  'transaction',
                  'zope.interface',
                  'zope.publisher',
+                 'zope.testrunner',
                  ]
 
 robot_require = ['robotsuite>=1.4.0',