[Checkins] SVN: AccessControl/trunk/ Update tests to take advantage of automatic test suite discovery.
Hano Schlichting
cvs-admin at zope.org
Sun May 20 14:58:43 UTC 2012
Log message for revision 126400:
Update tests to take advantage of automatic test suite discovery.
Changed:
U AccessControl/trunk/CHANGES.txt
U AccessControl/trunk/src/AccessControl/tests/testClassSecurityInfo.py
U AccessControl/trunk/src/AccessControl/tests/testImplementation.py
U AccessControl/trunk/src/AccessControl/tests/testModuleSecurity.py
U AccessControl/trunk/src/AccessControl/tests/testOwned.py
U AccessControl/trunk/src/AccessControl/tests/testPasswordDigest.py
U AccessControl/trunk/src/AccessControl/tests/testPermissionMapping.py
U AccessControl/trunk/src/AccessControl/tests/testPermissionRole.py
U AccessControl/trunk/src/AccessControl/tests/testRole.py
U AccessControl/trunk/src/AccessControl/tests/testSecurityManager.py
U AccessControl/trunk/src/AccessControl/tests/testZCML.py
U AccessControl/trunk/src/AccessControl/tests/testZopeGuards.py
U AccessControl/trunk/src/AccessControl/tests/testZopeSecurityPolicy.py
U AccessControl/trunk/src/AccessControl/tests/test_requestmethod.py
U AccessControl/trunk/src/AccessControl/tests/test_safeiter.py
U AccessControl/trunk/src/AccessControl/tests/test_tainted.py
U AccessControl/trunk/src/AccessControl/tests/test_userfolder.py
U AccessControl/trunk/src/AccessControl/tests/test_users.py
-=-
Modified: AccessControl/trunk/CHANGES.txt
===================================================================
--- AccessControl/trunk/CHANGES.txt 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/CHANGES.txt 2012-05-20 14:58:39 UTC (rev 126400)
@@ -6,6 +6,8 @@
- Added decorators for public, private and protected security declarations.
+- Update tests to take advantage of automatic test suite discovery.
+
2.13.7 (2011-12-12)
-------------------
Modified: AccessControl/trunk/src/AccessControl/tests/testClassSecurityInfo.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testClassSecurityInfo.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testClassSecurityInfo.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -130,12 +130,3 @@
# Do class initialization.
with self.assertRaisesRegexp(AssertionError, 'has 2 non-decorator'):
InitializeClass(Test)
-
-
-def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(ClassSecurityInfoTests))
- return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: AccessControl/trunk/src/AccessControl/tests/testImplementation.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testImplementation.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testImplementation.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -62,6 +62,3 @@
def test_suite():
return unittest.makeSuite(AccessControlImplementationTest)
-
-if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
Modified: AccessControl/trunk/src/AccessControl/tests/testModuleSecurity.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testModuleSecurity.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testModuleSecurity.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -81,7 +81,3 @@
def test_level_nondefault(self):
self.assertUnauth('AccessControl.tests.public_module', (), level=1)
-
-
-def test_suite():
- return unittest.makeSuite(ModuleSecurityTests)
Modified: AccessControl/trunk/src/AccessControl/tests/testOwned.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testOwned.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testOwned.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -290,10 +290,3 @@
self.assertEquals( self.root.parent.child.grandchild._owner
, previous_grandchild_owner
)
-
-
-def test_suite():
- return unittest.TestSuite((
- unittest.makeSuite(OwnedTests),
- unittest.makeSuite(OwnershipChangeTests),
- ))
Modified: AccessControl/trunk/src/AccessControl/tests/testPasswordDigest.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testPasswordDigest.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testPasswordDigest.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -78,15 +78,3 @@
# Sanity check
pw = 'my-password'
assert AuthEncoding.pw_validate(pw, pw)
-
-
-def test_suite():
- suite = unittest.TestSuite()
- suite.addTest( unittest.makeSuite( PasswordDigestTests ) )
- return suite
-
-def main():
- unittest.TextTestRunner().run(test_suite())
-
-if __name__ == '__main__':
- main()
Modified: AccessControl/trunk/src/AccessControl/tests/testPermissionMapping.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testPermissionMapping.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testPermissionMapping.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -9,9 +9,3 @@
from zope.interface.verify import verifyClass
verifyClass(IPermissionMappingSupport, RoleManager)
-
-
-def test_suite():
- return unittest.TestSuite((
- unittest.makeSuite(TestRoleManager),
- ))
Modified: AccessControl/trunk/src/AccessControl/tests/testPermissionRole.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testPermissionRole.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testPermissionRole.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -114,14 +114,3 @@
self.failUnless(getattr(a, '_d') == ('Manager',))
self.failUnless(getattr(a, '__name__') == 'a')
self.failUnless(getattr(a, '_p') == '_a_Permission')
-
-def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(PermissionRoleTests))
- return suite
-
-def main():
- unittest.TextTestRunner().run(test_suite())
-
-if __name__ == '__main__':
- main()
Modified: AccessControl/trunk/src/AccessControl/tests/testRole.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testRole.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testRole.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -9,9 +9,3 @@
from zope.interface.verify import verifyClass
verifyClass(IRoleManager, RoleManager)
-
-
-def test_suite():
- return unittest.TestSuite((
- unittest.makeSuite(TestRoleManager),
- ))
Modified: AccessControl/trunk/src/AccessControl/tests/testSecurityManager.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testSecurityManager.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testSecurityManager.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -262,10 +262,6 @@
def test_suite():
suite = unittest.TestSuite()
- suite.addTest( unittest.makeSuite( PythonSecurityManagerTests ) )
- suite.addTest( unittest.makeSuite( C_SecurityManagerTests ) )
+ suite.addTest(unittest.makeSuite(PythonSecurityManagerTests))
+ suite.addTest(unittest.makeSuite(C_SecurityManagerTests))
return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
-
Modified: AccessControl/trunk/src/AccessControl/tests/testZCML.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testZCML.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testZCML.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -438,6 +438,7 @@
>>> tearDown()
"""
+
def test_suite():
import doctest
return doctest.DocTestSuite(optionflags=doctest.ELLIPSIS)
Modified: AccessControl/trunk/src/AccessControl/tests/testZopeGuards.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testZopeGuards.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testZopeGuards.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -861,9 +861,9 @@
[2, 7, 8, 9]
>>> sorted(s)
[2, 7, 8, 9]
-
"""
+
def test_suite():
suite = unittest.TestSuite([
doctest.DocTestSuite(),
@@ -878,7 +878,3 @@
):
suite.addTest(unittest.makeSuite(cls))
return suite
-
-
-if __name__ == '__main__':
- unittest.main()
Modified: AccessControl/trunk/src/AccessControl/tests/testZopeSecurityPolicy.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testZopeSecurityPolicy.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/testZopeSecurityPolicy.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -13,6 +13,7 @@
"""Tests of ZopeSecurityPolicy
"""
+from doctest import DocTestSuite
import sys
import unittest
@@ -565,10 +566,8 @@
>>> c.__allow_access_to_unprotected_subobjects__ = 1
>>> bool(zsp.validate(c, c, 'bar', c.bar, Context(User(['spam']))))
True
-
"""
-from doctest import DocTestSuite
def test_suite():
suite = unittest.TestSuite()
Modified: AccessControl/trunk/src/AccessControl/tests/test_requestmethod.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/test_requestmethod.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/test_requestmethod.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -14,18 +14,16 @@
from zope.interface import implements
from zope.publisher.interfaces.browser import IBrowserRequest
+
class DummyRequest:
implements(IBrowserRequest)
-
+
def __init__(self, method):
self.method = method
+
def test_suite():
from doctest import DocFileSuite
return DocFileSuite('../requestmethod.txt',
globs=dict(GET=DummyRequest('GET'),
POST=DummyRequest('POST')))
-
-if __name__ == '__main__':
- import unittest
- unittest.main(defaultTest='test_suite')
Modified: AccessControl/trunk/src/AccessControl/tests/test_safeiter.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/test_safeiter.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/test_safeiter.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -60,7 +60,3 @@
self.assertEqual(self.checks, [(contid, 1),
(contid, 2),
(contid, 3)])
-
-
-def test_suite():
- return unittest.makeSuite(SafeIterTestCase)
Modified: AccessControl/trunk/src/AccessControl/tests/test_tainted.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/test_tainted.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/test_tainted.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -151,9 +151,3 @@
def testQuoted(self):
self.assertEquals(self.tainted.quoted(), self.quoted)
-
-
-def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestTaintedString))
- return suite
Modified: AccessControl/trunk/src/AccessControl/tests/test_userfolder.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/test_userfolder.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/test_userfolder.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -168,9 +168,3 @@
self.assertEqual(user.__, ENCRYPTED)
self.failUnless(uf._isPasswordEncrypted(user.__))
self.failUnless(pw_validate(user.__, PASSWORD))
-
-
-def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(UserFolderTests))
- return suite
Modified: AccessControl/trunk/src/AccessControl/tests/test_users.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/test_users.py 2012-05-20 14:51:20 UTC (rev 126399)
+++ AccessControl/trunk/src/AccessControl/tests/test_users.py 2012-05-20 14:58:39 UTC (rev 126400)
@@ -252,13 +252,3 @@
# See https://bugs.launchpad.net/zope2/+bug/142563
null = self._makeOne()
self.assertEqual(str(null), "<NullUnrestrictedUser (None, None)>")
-
-
-def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(BasicUserTests))
- suite.addTest(unittest.makeSuite(SimpleUserTests))
- suite.addTest(unittest.makeSuite(SpecialUserTests))
- suite.addTest(unittest.makeSuite(UnrestrictedUserTests))
- suite.addTest(unittest.makeSuite(NullUnrestrictedUserTests))
- return suite
More information about the checkins
mailing list