[Checkins]
SVN: grokcore.security/trunk/src/grokcore/security/tests/
Remove grok-only tests and fix up the few that remain
Philipp von Weitershausen
philikon at philikon.de
Mon Jul 28 17:00:38 EDT 2008
Log message for revision 88903:
Remove grok-only tests and fix up the few that remain
Changed:
D grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json.py
D grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json2.py
D grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json3.py
U grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_name.py
D grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc.py
D grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc2.py
D grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc3.py
D grokcore.security/trunk/src/grokcore/security/tests/security/missing_role_name.py
U grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require.py
D grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require_json.py
D grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require_xmlrpc.py
U grokcore.security/trunk/src/grokcore/security/tests/security/not_a_permissionclass.py
D grokcore.security/trunk/src/grokcore/security/tests/security/view_decorator.py
U grokcore.security/trunk/src/grokcore/security/tests/test_grok.py
-=-
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,21 +0,0 @@
-"""
-A permission has to be defined first (using grok.Permission for example)
-before it can be used in grok.require() in an JSON class.
-
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_json.MissingPermission'>. Use grok.Permission first.
- ...
-
-"""
-
-import grok
-import zope.interface
-
-class MissingPermission(grok.JSON):
- grok.context(zope.interface.Interface)
- grok.require('doesnt.exist')
-
- def foo(self):
- pass
-
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json2.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json2.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json2.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,21 +0,0 @@
-"""
-A permission has to be defined first (using grok.Permission for example)
-before it can be used in @grok.require().
-
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_json2.MissingPermission'>. Use grok.Permission first.
- ...
-
-"""
-
-import grok
-import zope.interface
-
-class MissingPermission(grok.JSON):
- grok.context(zope.interface.Interface)
-
- @grok.require('doesnt.exist')
- def foo(self):
- pass
-
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json3.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json3.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_json3.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,23 +0,0 @@
-"""
-An undefined permission that's never used (because it's being shadowed
-by a method-level directive) doesn't raise an error:
-
- >>> grok.testing.grok(__name__)
-
-"""
-
-import grok
-import zope.interface
-
-class Permission(grok.Permission):
- grok.name('json.exists')
-
-class MissingPermission(grok.JSON):
- grok.context(zope.interface.Interface)
-
- grok.require('doesnt.exist')
-
- @grok.require(Permission)
- def foo(self):
- pass
-
Modified: grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_name.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_name.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_name.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -8,8 +8,7 @@
Use grok.name to specify one.
"""
-import grok
-import zope.interface
+import grokcore.security as grok
class MissingName(grok.Permission):
pass
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,22 +0,0 @@
-"""
-A permission has to be defined first (using grok.Permission for example)
-before it can be used in grok.require() in an XMLRPC class.
-
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- ...
- ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_xmlrpc.MissingPermission'>. Use grok.Permission first.
- ...
-
-"""
-
-import grok
-import zope.interface
-
-class MissingPermission(grok.XMLRPC):
- grok.context(zope.interface.Interface)
- grok.require('doesnt.exist')
-
- def foo(self):
- pass
-
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc2.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc2.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc2.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,22 +0,0 @@
-"""
-A permission has to be defined first (using grok.Permission for example)
-before it can be used in @grok.require().
-
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- ...
- ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_xmlrpc2.MissingPermission'>. Use grok.Permission first.
- ...
-
-"""
-
-import grok
-import zope.interface
-
-class MissingPermission(grok.XMLRPC):
- grok.context(zope.interface.Interface)
-
- @grok.require('doesnt.exist')
- def foo(self):
- pass
-
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc3.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc3.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/missing_permission_xmlrpc3.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,23 +0,0 @@
-"""
-A permission has to be defined first (using grok.Permission for
-example) before it can be used in grok.require() in an XMLRPC
-class. However, this is *not* the the case for a default permission
-that is never used.
-
- >>> grok.testing.grok(__name__)
-
-"""
-
-import grok
-import zope.interface
-
-class Foo(grok.Permission):
- grok.name('foo')
-
-class MissingPermission(grok.XMLRPC):
- grok.context(zope.interface.Interface)
- grok.require('doesnt.exist')
-
- @grok.require(Foo)
- def foo(self):
- pass
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/missing_role_name.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/missing_role_name.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/missing_role_name.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,14 +0,0 @@
-"""
-A role has to have a name to be defined.
-
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- GrokError: A role needs to have a dotted name for its id.
- Use grok.name to specify one.
-"""
-
-import grok
-import zope.interface
-
-class MissingName(grok.Role):
- pass
Modified: grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -7,8 +7,7 @@
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
-import zope.interface
+import grokcore.security as grok
class One(grok.Permission):
grok.name('permission.1')
@@ -16,10 +15,6 @@
class Two(grok.Permission):
grok.name('permission.2')
-class MultipleView(grok.View):
- grok.context(zope.interface.Interface)
+class MultipleView(object):
grok.require(One)
grok.require(Two)
-
- def render(self):
- pass
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require_json.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require_json.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require_json.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,25 +0,0 @@
-"""
-Multiple calls of grok.require in one class are not allowed.
-
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- ...
- GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require_json.MultipleJSON'>. It may only be set once for a class.
-
-"""
-import grok
-import zope.interface
-
-class One(grok.Permission):
- grok.name('permission.1')
-
-class Two(grok.Permission):
- grok.name('permission.2')
-
-class MultipleJSON(grok.JSON):
- grok.context(zope.interface.Interface)
- grok.require(One)
- grok.require(Two)
-
- def render(self):
- pass
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require_xmlrpc.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require_xmlrpc.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/multiple_require_xmlrpc.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,24 +0,0 @@
-"""
-Multiple calls of grok.require in one class are not allowed.
-
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- ...
- GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require_xmlrpc.MultipleXMLRPC'>. It may only be set once for a class.
-"""
-import grok
-import zope.interface
-
-class One(grok.Permission):
- grok.name('permission.1')
-
-class Two(grok.Permission):
- grok.name('permission.2')
-
-class MultipleXMLRPC(grok.XMLRPC):
- grok.context(zope.interface.Interface)
- grok.require(One)
- grok.require(Two)
-
- def render(self):
- pass
Modified: grokcore.security/trunk/src/grokcore/security/tests/security/not_a_permissionclass.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/not_a_permissionclass.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/not_a_permissionclass.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -6,8 +6,9 @@
>>> class NotAProperPermission(object):
... pass
>>>
- >>> class NoPermission(grok.View):
- ... grok.context(zope.interface.Interface)
+ >>> import grokcore.security as grok
+ >>>
+ >>> class NoPermission(object):
... grok.require(NotAProperPermission)
...
... def render(self):
@@ -18,6 +19,3 @@
grok.Permission to the 'require' directive.
"""
-
-import grok
-import zope.interface
Deleted: grokcore.security/trunk/src/grokcore/security/tests/security/view_decorator.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/security/view_decorator.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/security/view_decorator.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -1,22 +0,0 @@
-"""
-Using the @grok.require decorator in a view class is not allowed.
-
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- GrokError: The @grok.require decorator is used for method 'render' in view <class 'grok.tests.security.view_decorator.BogusView'>. It may only be used for XML-RPC methods.
-
-
-"""
-
-import grok
-import zope.interface
-
-class Bogus(grok.Permission):
- grok.name('bogus.perm')
-
-class BogusView(grok.View):
- grok.context(zope.interface.Interface)
-
- @grok.require(Bogus)
- def render(self):
- pass
Modified: grokcore.security/trunk/src/grokcore/security/tests/test_grok.py
===================================================================
--- grokcore.security/trunk/src/grokcore/security/tests/test_grok.py 2008-07-28 21:00:17 UTC (rev 88902)
+++ grokcore.security/trunk/src/grokcore/security/tests/test_grok.py 2008-07-28 21:00:38 UTC (rev 88903)
@@ -29,7 +29,7 @@
if filename == '__init__.py':
continue
- dottedname = 'grok.tests.%s.%s' % (name, filename[:-3])
+ dottedname = 'grokcore.security.tests.%s.%s' % (name, filename[:-3])
test = doctest.DocTestSuite(dottedname,
setUp=setUpZope,
tearDown=cleanUpZope,
@@ -42,11 +42,7 @@
def test_suite():
suite = unittest.TestSuite()
- for name in ['adapter', 'error', 'view', 'event', 'security', 'catalog',
- 'zcml', 'static', 'utility', 'xmlrpc', 'json', 'container',
- 'traversal', 'form', 'grokker', 'directive',
- 'baseclass', 'annotation', 'application', 'template',
- 'viewlet', 'testsetup', 'conflict', 'order']:
+ for name in ['security']:
suite.addTest(suiteFromPackage(name))
return suite
More information about the Checkins
mailing list