[Zope3-checkins] CVS: Zope3/src/zope/app/contentdirective/tests - test_requirepermissions.py:1.3.8.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/contentdirective/tests
In directory cvs.zope.org:/tmp/cvs-serv31467

Modified Files:
      Tag: local-utility-branch
	test_requirepermissions.py 
Log Message:
Changed to use PlacelessSetup so we get the interface service set up.
We now need this because the content directive now tells the interface
service about the interfaces it sees.


=== Zope3/src/zope/app/contentdirective/tests/test_requirepermissions.py 1.3 => 1.3.8.1 ===
--- Zope3/src/zope/app/contentdirective/tests/test_requirepermissions.py:1.3	Tue Jan 21 16:35:23 2003
+++ Zope3/src/zope/app/contentdirective/tests/test_requirepermissions.py	Tue Mar 18 17:05:04 2003
@@ -18,6 +18,7 @@
 
 import zope.configuration
 import zope.app.security
+from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.app.security.exceptions import UndefinedPermissionError
 from zope.security.checker import selectChecker
 from zope.exceptions import Forbidden
@@ -28,8 +29,6 @@
 
 from zope.app.contentdirective.tests.modulehookup import * # XXX I hate this!
 
-from zope.testing.cleanup import CleanUp # Base class w registry cleanup
-
 import zope.app.contentdirective
 
 def defineDirectives():
@@ -47,9 +46,10 @@
 P1 = "extravagant"
 P2 = "paltry"
 
-class Test(CleanUp, unittest.TestCase):
+class Test(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
+        PlacelessSetup.setUp(self)
         defineDirectives()
         class B:
             def m1(self):
@@ -68,7 +68,7 @@
         self.assertState()
 
     def tearDown(self):
-        CleanUp.tearDown(self)
+        PlacelessSetup.tearDown(self)
         module.test_class = None
 
     def assertState(self, m1P=NOTSET, m2P=NOTSET, m3P=NOTSET):