[Zope3-checkins] CVS: Zope3/src/zope/app/component/tests - test_servicedirective.py:1.6

[Jim Fulton]

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

Modified Files:
	test_servicedirective.py 
Log Message:
No longer use metameta.zcml.
Updated to use a new configuration exception.


=== Zope3/src/zope/app/component/tests/test_servicedirective.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/component/tests/test_servicedirective.py:1.5	Mon May 12 12:32:40 2003
+++ Zope3/src/zope/app/component/tests/test_servicedirective.py	Mon Jul 28 18:21:27 2003
@@ -18,6 +18,7 @@
 from zope.exceptions import Forbidden, Unauthorized
 
 from zope.configuration.xmlconfig import testxmlconfig as xmlconfig, XMLConfig
+from zope.configuration.config import ConfigurationConflictError
 from zope.security.proxy import ProxyFactory
 from zope.component.exceptions import ComponentLookupError
 
@@ -39,7 +40,6 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        XMLConfig('metameta.zcml', zope.configuration)()
         XMLConfig('meta.zcml', zope.app.component)()
 
     def testServiceConfigNoType(self):
@@ -59,10 +59,8 @@
             )))
 
     def testDuplicateServiceConfig(self):
-        from zope.configuration.xmlconfig \
-             import ZopeConflictingConfigurationError
         self.assertRaises(
-            ZopeConflictingConfigurationError,
+            ConfigurationConflictError,
             xmlconfig,
             StringIO(template % (
             """