[Zope3-checkins] CVS: Zope3/src/zope/app/security/tests - test_securitydirectives.py:1.9

[Jim Fulton]

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

Modified Files:
	test_securitydirectives.py 
Log Message:
Updated to use new configuration error for conflicts.


=== Zope3/src/zope/app/security/tests/test_securitydirectives.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/security/tests/test_securitydirectives.py:1.8	Tue Jun  3 18:46:22 2003
+++ Zope3/src/zope/app/security/tests/test_securitydirectives.py	Mon Jul 28 18:22:01 2003
@@ -26,6 +26,7 @@
 from zope.app.interfaces.security import IAuthenticationService
 
 from zope.configuration.xmlconfig import ZopeXMLConfigurationError
+from zope.configuration.config import ConfigurationConflictError
 from zope.configuration.xmlconfig import XMLConfig, xmlconfig
 
 from zope.testing.cleanup import CleanUp # Base class w registry cleanup
@@ -130,7 +131,7 @@
      """)
 
         #self.assertRaises(AlreadyRegisteredError, xmlconfig, f)
-        self.assertRaises(ZopeXMLConfigurationError, xmlconfig, f)
+        self.assertRaises(ConfigurationConflictError, xmlconfig, f)
 
 class TestRoleDirective(CleanUp, unittest.TestCase):
     def setUp(self):
@@ -167,7 +168,7 @@
      """)
 
         #self.assertRaises(AlreadyRegisteredError, xmlconfig, f)
-        self.assertRaises(ZopeXMLConfigurationError, xmlconfig, f)
+        self.assertRaises(ConfigurationConflictError, xmlconfig, f)
 
 class TestRolePermission(CleanUp, unittest.TestCase):