Fixed test for 'Connection refused' which could be 'Connection reset'.

plone · Mar 1, 2019 · e7a34f5 · e7a34f5
1 parent 4219a3c
commit e7a34f5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/news/59.bugfix b/news/59.bugfix
@@ -0,0 +1 @@
+Fixed test for 'Connection refused' which could be 'Connection reset'.  [maurits]
diff --git a/src/plone/testing/zope.rst b/src/plone/testing/zope.rst
@@ -523,7 +523,14 @@ When the server is torn down, the WSGIServer thread is stopped.::
     Tear down plone.testing.zope.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
 
-    >>> conn = urlopen(app_url + '/folder1', timeout=5)
-    Traceback (most recent call last):
-    ...
-    URLError: <urlopen error [Errno ...] Connection refused>
+We can expect one of these exceptions:
+- URLError: <urlopen error [Errno ...] Connection refused>
+- error: [Errno 104] Connection reset by peer
+
+    >>> try:
+    ...     conn = urlopen(app_url + '/folder1', timeout=5)
+    ... except Exception as exc:
+    ...     if 'Connection refused' not in str(exc) and 'Connection reset' not in str(exc):
+    ...         raise exc
+    ... else:
+    ...     print('urlopen should have raised exception')
diff --git a/src/plone/testing/zserver.rst b/src/plone/testing/zserver.rst
@@ -526,10 +526,18 @@ When the server is torn down, the ZServer thread is stopped.::
     Tear down plone.testing.zserver.Startup in ... seconds.
     Tear down plone.testing.zca.LayerCleanup in ... seconds.
 
-    >>> conn = urllib2.urlopen(app_url + '/folder1', timeout=5)
-    Traceback (most recent call last):
-    ...
-    URLError: <urlopen error [Errno ...] Connection refused>
+We can expect one of these exceptions:
+- URLError: <urlopen error [Errno ...] Connection refused>
+- error: [Errno 104] Connection reset by peer
+
+    >>> try:
+    ...     conn = urllib2.urlopen(app_url + '/folder1', timeout=5)
+    ... except Exception as exc:
+    ...     if 'Connection refused' not in str(exc) and 'Connection reset' not in str(exc):
+    ...         raise exc
+    ... else:
+    ...     print('urllib2.urlopen should have raised exception')
+
 
 FTP server
 ~~~~~~~~~~