[Checkins] SVN: zope.component/tseaver-test_cleanup/ Skip security-related tests if zope.security is not importable.
Tres Seaver
cvs-admin at zope.org
Wed Jun 27 16:08:42 UTC 2012
Log message for revision 127137:
Skip security-related tests if zope.security is not importable.
Changed:
_U zope.component/tseaver-test_cleanup/
U zope.component/tseaver-test_cleanup/src/zope/component/tests/test_zcml.py
-=-
Modified: zope.component/tseaver-test_cleanup/src/zope/component/tests/test_zcml.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/tests/test_zcml.py 2012-06-27 16:08:33 UTC (rev 127136)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test_zcml.py 2012-06-27 16:08:38 UTC (rev 127137)
@@ -15,8 +15,13 @@
"""
import unittest
-from zope.component.testing import PlacelessSetup
+def skipIfNoSecurity(testfunc):
+ try:
+ import zope.security
+ except ImportError:
+ return lambda self: None
+ return testfunc
class Test_handler(unittest.TestCase):
@@ -159,6 +164,7 @@
self.assertEqual(action['discriminator'], None)
self.assertEqual(action['args'], ('', Interface))
+ @skipIfNoSecurity
def test_single_factory_single_for_w_permission(self):
from zope.interface import Interface
from zope.security.adapter import LocatingUntrustedAdapterFactory
@@ -188,6 +194,7 @@
self.assertEqual(action['args'][4], '')
self.assertEqual(action['args'][5], 'TESTING')
+ @skipIfNoSecurity
def test_single_factory_single_for_w_locate_no_permission(self):
from zope.interface import Interface
from zope.security.adapter import LocatingUntrustedAdapterFactory
@@ -216,6 +223,7 @@
self.assertEqual(action['args'][4], '')
self.assertEqual(action['args'][5], 'TESTING')
+ @skipIfNoSecurity
def test_single_factory_single_for_w_trusted_no_permission(self):
from zope.interface import Interface
from zope.security.adapter import TrustedAdapterFactory
@@ -385,6 +393,7 @@
self.assertEqual(action['discriminator'], None)
self.assertEqual(action['args'], ('', Interface))
+ @skipIfNoSecurity
def test_w_factory_w_provides_w_permission(self):
from zope.interface import Interface
from zope.security.adapter import LocatingUntrustedAdapterFactory
@@ -427,6 +436,7 @@
self.assertEqual(action['discriminator'], None)
self.assertEqual(action['args'], ('', Interface))
+ @skipIfNoSecurity
def test_w_factory_w_provides_wo_permission_w_locate(self):
from zope.interface import Interface
from zope.security.adapter import LocatingUntrustedAdapterFactory
@@ -468,6 +478,7 @@
self.assertEqual(action['discriminator'], None)
self.assertEqual(action['args'], ('', Interface))
+ @skipIfNoSecurity
def test_w_factory_w_provides_wo_permission_w_trusted(self):
from zope.interface import Interface
from zope.security.adapter import TrustedAdapterFactory
@@ -657,6 +668,7 @@
self.assertEqual(action['discriminator'], None)
self.assertEqual(action['args'], ('', IFoo))
+ @skipIfNoSecurity
def test_w_component_w_provides_w_permission(self):
from zope.interface import Interface
from zope.proxy import removeAllProxies
@@ -895,6 +907,7 @@
self.assertEqual(action['args'][4], '')
self.assertEqual(action['args'][5], 'TESTING')
+ @skipIfNoSecurity
def test_w_single_factory_single_for__w_permission(self):
from zope.interface import Interface
from zope.component.zcml import handler
@@ -926,6 +939,7 @@
self.assertEqual(action['args'][4], '')
self.assertEqual(action['args'][5], 'TESTING')
+ @skipIfNoSecurity
def test_w_single_factory_single_for__w_permission_and_allowed_attrs(self):
from zope.interface import Interface
from zope.component.zcml import handler
@@ -951,6 +965,7 @@
checker = factory.checker
self.assertEqual(checker.get_permissions, {'bar': 'testing'})
+ @skipIfNoSecurity
def test_w_single_factory_single_for__w_permission_and_allowed_iface(self):
from zope.interface import Interface
from zope.component.zcml import handler
@@ -1066,6 +1081,7 @@
self.assertEqual(action['discriminator'], None)
self.assertEqual(action['args'], ('', Interface))
+ @skipIfNoSecurity
def test_w_permission(self):
from zope.interface import Interface
from zope.component.zcml import handler
More information about the checkins
mailing list