[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/ContentDirective/tests - testDirectives.py:1.9 testFactory.py:1.9 testRequirePermissions.py:1.6

[R. David Murray]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ContentDirective/tests
In directory cvs.zope.org:/tmp/cvs-serv10913/lib/python/Zope/App/ContentDirective/tests

Modified Files:
	testDirectives.py testFactory.py testRequirePermissions.py 
Log Message:
Merge of rdmurray-metameta-branch.  See checkin message for 
doc/zcml/meta.stx for a more comprehensive checkin comment.


=== Zope3/lib/python/Zope/App/ContentDirective/tests/testDirectives.py 1.8 => 1.9 ===
--- Zope3/lib/python/Zope/App/ContentDirective/tests/testDirectives.py:1.8	Fri Oct  4 14:37:14 2002
+++ Zope3/lib/python/Zope/App/ContentDirective/tests/testDirectives.py	Wed Nov  6 17:30:21 2002
@@ -25,6 +25,7 @@
 from Zope.Configuration.xmlconfig import ZopeXMLConfigurationError
 from Zope.App.tests.PlacelessSetup import PlacelessSetup
 from Zope.Security.SecurityManagement import newSecurityManager, system_user
+import Zope.Configuration
 import Zope.App.ComponentArchitecture
 import Zope.App.Security
 import Zope.App.ContentDirective
@@ -45,6 +46,7 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
         newSecurityManager(system_user)
+        XMLConfig('metameta.zcml', Zope.Configuration)()
         XMLConfig('meta.zcml', Zope.App.ContentDirective)()
         XMLConfig('meta.zcml', Zope.App.Security)()
         
@@ -102,6 +104,7 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
         newSecurityManager(system_user)
+        XMLConfig('metameta.zcml', Zope.Configuration)()
         XMLConfig('meta.zcml', Zope.App.ContentDirective)()
         XMLConfig('meta.zcml', Zope.App.Security)()
 


=== Zope3/lib/python/Zope/App/ContentDirective/tests/testFactory.py 1.8 => 1.9 ===
--- Zope3/lib/python/Zope/App/ContentDirective/tests/testFactory.py:1.8	Fri Oct  4 14:37:14 2002
+++ Zope3/lib/python/Zope/App/ContentDirective/tests/testFactory.py	Wed Nov  6 17:30:21 2002
@@ -23,6 +23,7 @@
 from Zope.App.tests.PlacelessSetup import PlacelessSetup
 from Zope.Security.SecurityManagement import newSecurityManager, system_user
 
+import Zope.Configuration
 import Zope.App.Security
 from Zope.App.Security.Exceptions import UndefinedPermissionError
 
@@ -41,6 +42,7 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
         newSecurityManager(system_user)
+        XMLConfig('metameta.zcml', Zope.Configuration)()
         XMLConfig('meta.zcml', Zope.App.ContentDirective)()
         XMLConfig('meta.zcml', Zope.App.Security)()
 


=== Zope3/lib/python/Zope/App/ContentDirective/tests/testRequirePermissions.py 1.5 => 1.6 ===
--- Zope3/lib/python/Zope/App/ContentDirective/tests/testRequirePermissions.py:1.5	Tue Oct  1 08:47:49 2002
+++ Zope3/lib/python/Zope/App/ContentDirective/tests/testRequirePermissions.py	Wed Nov  6 17:30:21 2002
@@ -16,6 +16,7 @@
 import unittest
 from cStringIO import StringIO
 
+import Zope.Configuration
 import Zope.App.Security
 from Zope.App.Security import protectClass
 from Zope.App.Security.Exceptions import UndefinedPermissionError
@@ -31,6 +32,7 @@
 import Zope.App.ContentDirective
 
 def defineDirectives():
+    XMLConfig('metameta.zcml', Zope.Configuration)()
     XMLConfig('meta.zcml', Zope.App.ContentDirective)()
     XMLConfig('meta.zcml', Zope.App.Security)()
     xmlconfig(StringIO("""<zopeConfigure