diff --git a/CHANGES.rst b/CHANGES.rst
index e47dd40..46131be 100644
--- a/CHANGES.rst
+++ b/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.
diff --git a/src/plone/testing/publisher.rst b/src/plone/testing/publisher.rst
index 921ebc9..7fedc0e 100644
--- a/src/plone/testing/publisher.rst
+++ b/src/plone/testing/publisher.rst
@@ -42,8 +42,8 @@ the ```` or ```` directives without loading the ne
... """)
Traceback (most recent call last):
...
- ZopeXMLConfigurationError: File "", 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.::
diff --git a/src/plone/testing/z2.rst b/src/plone/testing/z2.rst
index 6479e6a..49d2285 100644
--- a/src/plone/testing/z2.rst
+++ b/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
+ ""
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()
-
+ >>> conn.read()
+ ">> conn.close()
Test tear-down does nothing beyond what the base layers do.::
diff --git a/src/plone/testing/zca.rst b/src/plone/testing/zca.rst
index 5a5e7bb..9f1900c 100644
--- a/src/plone/testing/zca.rst
+++ b/src/plone/testing/zca.rst
@@ -230,8 +230,8 @@ Before the test, we cannot use e.g. a ```` directive without loading
... """)
Traceback (most recent call last):
...
- ZopeXMLConfigurationError: File "", 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.::