Merge abb24e3 into cc2f063

CHANGES.rst

@@ -14,6 +14,9 @@ New features:
 
 Bug fixes:
 
+- Loosened doctest assertions to keep up with Zope-side changes.
+  [Rotonen]
+
 - Fix most of the code smells Jenkins complains about.
 
 - Fix the Zope exception hook when using the ZServer layer.

src/plone/testing/publisher.rst

@@ -42,8 +42,8 @@ the ``<permission />`` or ``<browser:view />`` directives without loading the ne
     ... </configure>""")
     Traceback (most recent call last):
     ...
-    ZopeXMLConfigurationError: File "<string>", line 5.4
-        ConfigurationError: ('Unknown directive', u'http://namespaces.zope.org/zope', u'permission')
+    ConfigurationError: ('Unknown directive', u'http://namespaces.zope.org/zope', u'permission')
+    ...
 
 Layer setup creates a configuration context we can use to load further configuration.::
 

src/plone/testing/z2.rst

@@ -380,8 +380,8 @@ We can now view this via the test browser:::
 
     >>> browser.open(app.absolute_url() + '/folder1')
 
-    >>> 'folder1' in browser.contents
-    True
+    >>> browser.contents
+    "<Folder ...>"
 
 The test browser integration converts the URL into a request and passes control to Zope's publisher.
 Let's check that query strings are available for input processing:::
@@ -499,8 +499,8 @@ We can now look for this new object through the server.::
 
     >>> import urllib2
     >>> conn = urllib2.urlopen(app_url + '/folder1', timeout=5)
-    >>> print conn.read()
-    <Folder at folder1>
+    >>> conn.read()
+    "<Folder ..."
     >>> conn.close()
 
 Test tear-down does nothing beyond what the base layers do.::

src/plone/testing/zca.rst

@@ -230,8 +230,8 @@ Before the test, we cannot use e.g. a ``<utility />`` directive without loading
     ... </configure>""")
     Traceback (most recent call last):
     ...
-    ZopeXMLConfigurationError: File "<string>", line 2.4
-        ConfigurationError: ('Unknown directive', u'http://namespaces.zope.org/zope', u'utility')
+    ConfigurationError: ('Unknown directive', u'http://namespaces.zope.org/zope', u'utility')
+    ...
 
 Layer setup creates a configuration context we can use to load further configuration.::