[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/tests/setup.py Reverted a merger. That sucks, since the trunk works fine with the

[Stephan Richter]

Log message for revision 27068:
  Reverted a merger. That sucks, since the trunk works fine with the 
  change.
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tests/setup.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tests/setup.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tests/setup.py	2004-08-12 17:51:21 UTC (rev 27067)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tests/setup.py	2004-08-12 18:11:23 UTC (rev 27068)
@@ -89,10 +89,13 @@
 
 #------------------------------------------------------------------------
 # Placeful setup
+from zope.app.component.hooks import getServices_hook, adapter_hook
 from zope.app.tests.placelesssetup import setUp as placelessSetUp
 from zope.app.tests.placelesssetup import tearDown as placelessTearDown
 def placefulSetUp(site=False):
     placelessSetUp()
+    zope.component.getServices.sethook(getServices_hook)
+    zope.component.adapter_hook.sethook(adapter_hook)
     setUpAnnotations()
     setUpDependable()
     setUpTraversal()
@@ -107,6 +110,7 @@
 from zope.app.component.hooks import setSite
 def placefulTearDown():
     placelessTearDown()
+    zope.component.getServices.reset()
     setSite()