Merge pull request #49 from plone/fix-zserver-exception-hook

Fix the Zope exception hook when using the ZServer layer.
plone · Jun 22, 2018 · cc2f063 · cc2f063 · jenkins-plone-org · Jun 22, 2018
2 parents 0c4c439 + 084d316
commit cc2f063
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -16,6 +16,8 @@ Bug fixes:
 
 - Fix most of the code smells Jenkins complains about.
 
+- Fix the Zope exception hook when using the ZServer layer.
+
 
 6.0.0 (2018-02-05)
 ------------------

diff --git a/src/plone/testing/z2.py b/src/plone/testing/z2.py
@@ -988,6 +988,7 @@ def setUp(self):
 
         self._shutdown = False
 
+        self.setUpExceptionHook()
         self.setUpServer()
 
         self.thread = Thread(
@@ -1006,10 +1007,20 @@ def tearDown(self):
         time.sleep(0.5)
 
         self.tearDownServer()
+        self.tearDownExceptionHook()
 
         del self['host']
         del self['port']
 
+    def setUpExceptionHook(self):
+        from ZServer.ZPublisher.exceptionhook import EXCEPTION_HOOK
+        import Zope2
+        Zope2.zpublisher_exception_hook = EXCEPTION_HOOK
+
+    def tearDownExceptionHook(self):
+        import Zope2
+        Zope2.zpublisher_exception_hook = None
+
     def setUpServer(self):
         """Create a ZServer server instance and save it in self.zserver
         """