[Checkins] SVN: zope.securitypolicy/trunk/ Get rid of zope.principalregistry as a testing dependency, providing own dummy principal registry.
Dan Korostelev
nadako at gmail.com
Sat Mar 14 11:50:25 EDT 2009
Log message for revision 98094:
Get rid of zope.principalregistry as a testing dependency, providing own dummy principal registry.
Changed:
U zope.securitypolicy/trunk/CHANGES.txt
U zope.securitypolicy/trunk/buildout.cfg
U zope.securitypolicy/trunk/setup.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/__init__.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_role.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_vocabulary.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py
-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/CHANGES.txt 2009-03-14 15:50:25 UTC (rev 98094)
@@ -8,9 +8,11 @@
- Change ``zope.app.security`` dependency to the new ``zope.authentication``
package, dropping a big number of unused dependencies.
-- Get rid of ``zope.app.testing`` test dependency. Add ``ZODB3`` to
- install dependencies, because we use `Persistent` class.
+- Get rid of ``zope.app.testing`` and other testing dependencices.
+- Add ``ZODB3`` to install dependencies, because we use `Persistent`
+ class. We didn't fail before, because it was installed implicitly.
+
3.5.1 (2009-03-10)
------------------
Modified: zope.securitypolicy/trunk/buildout.cfg
===================================================================
--- zope.securitypolicy/trunk/buildout.cfg 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/buildout.cfg 2009-03-14 15:50:25 UTC (rev 98094)
@@ -1,12 +1,7 @@
[buildout]
develop = .
-parts = test python
+parts = test
[test]
recipe = zc.recipe.testrunner
-eggs = zope.securitypolicy [test]
-
-[python]
-recipe = zc.recipe.egg
eggs = zope.securitypolicy
-interpreter = python
Modified: zope.securitypolicy/trunk/setup.py
===================================================================
--- zope.securitypolicy/trunk/setup.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/setup.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -51,8 +51,6 @@
packages=find_packages('src'),
package_dir={'': 'src'},
namespace_packages=['zope'],
- extras_require=dict(
- test=['zope.testing', 'zope.principalregistry']),
install_requires=[
'setuptools',
'ZODB3',
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/__init__.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/__init__.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/__init__.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -1,2 +1,50 @@
+##############################################################################
#
-# This file is necessary to make this directory a package.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""
+$Id$
+"""
+from zope.interface import implements
+from zope.authentication.interfaces import IAuthentication, PrincipalLookupError
+from zope.security.interfaces import IPrincipal
+
+class DummyPrincipalRegistry(object):
+ """Dummy principal registry that only implements getPrincipal
+ and definePrincipal method that are needed for securitypolicy tests."""
+
+ implements(IAuthentication)
+
+ def __init__(self):
+ self._principals = {}
+
+ def getPrincipal(self, id):
+ if id not in self._principals:
+ raise PrincipalLookupError(id)
+ return self._principals[id]
+
+ def definePrincipal(self, id, title=u'', description=u''):
+ p = DummyPrincipal(id, title, description)
+ self._principals[id] = p
+ return p
+
+principalRegistry = DummyPrincipalRegistry()
+
+class DummyPrincipal(object):
+ """Very simple principal implementation"""
+
+ implements(IPrincipal)
+
+ def __init__(self, id, title=u'', description=u''):
+ self.id = id
+ self.title = title
+ self.description = description
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -28,8 +28,8 @@
from zope.securitypolicy.interfaces import Allow, Deny, Unset
from zope.securitypolicy.principalpermission import \
AnnotationPrincipalPermissionManager
+from zope.securitypolicy.tests import principalRegistry
-from zope.principalregistry.principalregistry import principalRegistry
class Manageable(object):
implements(IAttributeAnnotatable)
@@ -43,8 +43,7 @@
def _make_principal(self, id=None, title=None):
p = principalRegistry.definePrincipal(
id or 'APrincipal',
- title or 'A Principal',
- login = id or 'APrincipal')
+ title or 'A Principal')
return p.id
def testUnboundPrincipalPermission(self):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -20,7 +20,6 @@
from zope.interface import implements
from zope.annotation.interfaces import IAttributeAnnotatable
-from zope.principalregistry.principalregistry import principalRegistry
from zope.component.testing import PlacelessSetup
from zope.annotation.attribute import AttributeAnnotations
@@ -28,6 +27,7 @@
from zope.securitypolicy.interfaces import Allow, Deny
from zope.securitypolicy.interfaces import IRole
from zope.securitypolicy.role import Role
+from zope.securitypolicy.tests import principalRegistry
class Manageable(object):
implements(IAttributeAnnotatable)
@@ -46,8 +46,7 @@
def _make_principal(self, id=None, title=None):
p = principalRegistry.definePrincipal(
id or 'APrincipal',
- title or 'A Principal',
- login = id or 'APrincipal')
+ title or 'A Principal')
return p.id
def _make_roleManager(self, obj=None):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -23,11 +23,11 @@
from zope.security.permission import Permission
from zope.authentication.interfaces import IAuthentication
-from zope.principalregistry.principalregistry import principalRegistry
from zope.securitypolicy.interfaces import Allow, Deny, Unset
from zope.securitypolicy.principalpermission import \
principalPermissionManager as manager
+from zope.securitypolicy.tests import principalRegistry
def definePermission(id, title=None, description=None):
@@ -45,8 +45,7 @@
def _make_principal(self, id=None, title=None):
p = principalRegistry.definePrincipal(
id or 'APrincipal',
- title or 'A Principal',
- login = id or 'APrincipal')
+ title or 'A Principal')
return p.id
def testUnboundPrincipalPermission(self):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -21,12 +21,12 @@
from zope.component.testing import PlacelessSetup
from zope.authentication.interfaces import IAuthentication
-from zope.principalregistry.principalregistry import principalRegistry
from zope.securitypolicy.role import Role
from zope.securitypolicy.interfaces import Allow, Deny
from zope.securitypolicy.interfaces import IRole
from zope.securitypolicy.principalrole import principalRoleManager
+from zope.securitypolicy.tests import principalRegistry
def defineRole(id, title=None, description=None):
role = Role(id, title, description)
@@ -42,8 +42,7 @@
def _make_principal(self, id=None, title=None):
p = principalRegistry.definePrincipal(
id or 'APrincipal',
- title or 'A Principal',
- login = id or 'APrincipal')
+ title or 'A Principal')
return p.id
def testUnboundPrincipalRole(self):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_role.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_role.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_role.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
def test_suite():
@@ -26,4 +26,3 @@
if __name__ == '__main__':
unittest.main(defaultTest='test_suite')
-
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -25,7 +25,6 @@
from zope.component.testing import PlacelessSetup
from zope.authentication.interfaces import IAuthentication
-from zope.principalregistry.principalregistry import principalRegistry
from zope.securitypolicy.role import Role
from zope.securitypolicy.interfaces import Allow
@@ -37,6 +36,7 @@
from zope.securitypolicy.principalrole import \
principalRoleManager as principal_role_mgr
import zope.securitypolicy.tests
+from zope.securitypolicy.tests import principalRegistry
def defineRole(id, title=None, description=None):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_vocabulary.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_vocabulary.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_vocabulary.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
def test_suite():
return unittest.TestSuite((
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py 2009-03-14 15:11:01 UTC (rev 98093)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py 2009-03-14 15:50:25 UTC (rev 98094)
@@ -20,7 +20,7 @@
from zope.component import provideAdapter
from zope.component.testing import setUp as componentSetUp
from zope.component.testing import tearDown as componentTearDown
-from zope.testing.doctestunit import DocFileSuite
+from zope.testing.doctest import DocFileSuite
from zope.annotation.interfaces import IAnnotatable
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.annotation.interfaces import IAnnotations
More information about the Checkins
mailing list