[Checkins] SVN: zope.security/trunk/ Normalize testcase module-scope imports: test_set_simpleinteractin.

Tres Seaver cvs-admin at zope.org
Fri Dec 21 01:58:31 UTC 2012


Log message for revision 128830:
  Normalize testcase module-scope imports:  test_set_simpleinteractin.

Changed:
  _U  zope.security/trunk/
  U   zope.security/trunk/src/zope/security/tests/test_simpleinteraction.py

-=-
Modified: zope.security/trunk/src/zope/security/tests/test_simpleinteraction.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_simpleinteraction.py	2012-12-21 01:58:30 UTC (rev 128829)
+++ zope.security/trunk/src/zope/security/tests/test_simpleinteraction.py	2012-12-21 01:58:31 UTC (rev 128830)
@@ -15,9 +15,6 @@
 """
 import unittest
 
-from zope.interface.verify import verifyObject
-from zope.security.interfaces import IInteraction
-from zope.security.simplepolicies import ParanoidSecurityPolicy
 
 class RequestStub(object):
 
@@ -29,10 +26,14 @@
 class TestInteraction(unittest.TestCase):
 
     def test(self):
+        from zope.interface.verify import verifyObject
+        from zope.security.interfaces import IInteraction
+        from zope.security.simplepolicies import ParanoidSecurityPolicy
         interaction = ParanoidSecurityPolicy()
         verifyObject(IInteraction, interaction)
 
     def test_add(self):
+        from zope.security.simplepolicies import ParanoidSecurityPolicy
         rq = RequestStub()
         interaction = ParanoidSecurityPolicy()
         interaction.add(rq)
@@ -46,6 +47,7 @@
         self.assertRaises(ValueError, interaction2.add, rq)
 
     def test_remove(self):
+        from zope.security.simplepolicies import ParanoidSecurityPolicy
         rq = RequestStub()
         interaction = ParanoidSecurityPolicy()
 
@@ -58,6 +60,9 @@
         self.assert_(rq.interaction is None)
 
     def testCreateInteraction(self):
+        from zope.interface.verify import verifyObject
+        from zope.security.interfaces import IInteraction
+        from zope.security.simplepolicies import ParanoidSecurityPolicy
         i1 = ParanoidSecurityPolicy()
         verifyObject(IInteraction, i1)
         self.assertEquals(list(i1.participations), [])
@@ -70,10 +75,6 @@
 
 
 def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestInteraction))
-    return suite
-
-
-if __name__ == '__main__':
-    unittest.main()
+    return unittest.TestSuite((
+        unittest.makeSuite(TestInteraction),
+    ))



More information about the checkins mailing list