Also set Zope2.zpublisher_validated_hook in InstallHook, since the

order of execution is different with tests, and it's been already set, thus our patch has no effect otherwise.
zopefoundation · Apr 16, 2009 · 02f6ef6 · 02f6ef6
1 parent 4668153
commit 02f6ef6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+trunk
+-----
+
+* Also set ``Zope2.zpublisher_validated_hook`` in InstallHook, since
+  the order of execution is different with tests, and it's been
+  already set, thus our patch has no effect otherwise.
+
 1.0 - October 15, 2008
 ----------------------
 

diff --git a/plone/validatehook/hook.py b/plone/validatehook/hook.py
@@ -26,9 +26,13 @@ def InstallHook():
 
     Note that we can not change Zope2.zpublisher_validated_hook since
     the Zope startup code sets that *after* product initialization.
+    However, when testing (presumably with ZopeTestCase) we need to
+    set it because it's already set.
     """
+    import Zope2
     from Zope2.App import startup
     startup.validated_hook=ValidateHookWrapper(startup.validated_hook)
+    Zope2.zpublisher_validated_hook = startup.validated_hook
 
     logger.info("Wrapped the Zope2 zpublisher validation hook")