[Checkins] SVN: grok/branches/gotcha-configuration-actions/src/grok/tests/ Get all but 4 tests to pass. These tests need fixing because exceptions are now

[Philipp von Weitershausen]

Log message for revision 80739:
  Get all but 4 tests to pass. These tests need fixing because exceptions are now
  wrapped by the zope.configuration machinery.
  

Changed:
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/zcml/directiveerror.py

-=-
Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission.py	2007-10-09 11:54:01 UTC (rev 80738)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission.py	2007-10-09 12:03:22 UTC (rev 80739)
@@ -3,8 +3,10 @@
 before it can be used in grok.require().
 
     >>> grok.tests.grok(__name__)
+    Traceback (most recent call last):
     ...
     ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission.MissingPermission'>. Use grok.Permission first.
+    ...
 
 """
 

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require.py	2007-10-09 11:54:01 UTC (rev 80738)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require.py	2007-10-09 12:03:22 UTC (rev 80739)
@@ -4,7 +4,8 @@
   >>> grok.tests.grok(__name__)
   Traceback (most recent call last):
     ...
-  GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require.MultipleView'>. It may only be set once for a class.
+  ConfigurationExecutionError: martian.error.GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require.MultipleView'>. It may only be set once for a class.
+  ...
 
 """
 import grok

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/zcml/directiveerror.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/zcml/directiveerror.py	2007-10-09 11:54:01 UTC (rev 80738)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/zcml/directiveerror.py	2007-10-09 12:03:22 UTC (rev 80739)
@@ -14,8 +14,8 @@
   ... </configure>''', context=context)
   Traceback (most recent call last):
     ...
-  ConfigurationExecutionError: martian.error.GrokError: No module-level context for <class 'grok.tests.zcml.directiveerror.CavePainting'>, please use grok.context.
-  ...
+  ZopeXMLConfigurationError: File "<string>", line 6.4-6.57
+      GrokError: No module-level context for <class 'grok.tests.zcml.directiveerror.CavePainting'>, please use grok.context.
 
 """
 import grok