[Zope-Checkins] CVS: Zope/lib/python/AccessControl/tests - testPasswordDigest.py:1.1.20.1 testSecurity.py:1.4.24.1 testUserFolder.py:1.2.14.1 framework.py:NONE

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/AccessControl/tests
In directory cvs.zope.org:/tmp/cvs-serv15075/lib/python/AccessControl/tests

Modified Files:
      Tag: tseaver-utxfixup-branch
	testPasswordDigest.py testSecurity.py testUserFolder.py 
Removed Files:
      Tag: tseaver-utxfixup-branch
	framework.py 
Log Message:


 o Add new command line options:

       -m 

          Run all tests in a single, giant suite (consolidates error
          reporting).  This makes running the tests much cleaner, and
          more "PyUnit"-like.

       -P

          *Don't* add 'lib/python' to the Python search path (on
          by default).

 o *Stop* munging sys.path to make "local imports" work (source of
   ugly side effect bugs).


=== Zope/lib/python/AccessControl/tests/testPasswordDigest.py 1.1 => 1.1.20.1 ===
 __version__='$Revision$'[11:-2]
 
-import os, sys
-execfile(os.path.join(sys.path[0], 'framework.py'))
+import os, sys, unittest
 
 from AccessControl import AuthEncoding
 import unittest
@@ -156,4 +155,14 @@
         pw = 'my-password'
         assert AuthEncoding.pw_validate(pw, pw)
 
-framework()
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest( unittest.makeSuite( PasswordDigestTests ) )
+    return suite
+
+def main():
+    unittest.TextTestRunner().run(test_suite())
+
+if __name__ == '__main__':
+    main()


=== Zope/lib/python/AccessControl/tests/testSecurity.py 1.4 => 1.4.24.1 ===
 __version__='$Revision$'[11:-2]
 
-import os, sys
-execfile(os.path.join(sys.path[0], 'framework.py'))
+import os, sys, unittest
 
 import ZODB
 from DocumentTemplate import HTML
@@ -160,4 +159,14 @@
         assert res == '10', res
 
     # Note: we need more tests!
-framework()
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest( unittest.makeSuite( SecurityTests ) )
+    return suite
+
+def main():
+    unittest.TextTestRunner().run(test_suite())
+
+if __name__ == '__main__':
+    main()


=== Zope/lib/python/AccessControl/tests/testUserFolder.py 1.2 => 1.2.14.1 ===
 __version__='$Revision$'[11:-2]
 
-import os, sys
-execfile(os.path.join(sys.path[0], 'framework.py'))
+import os, sys, unittest
 
 import ZODB
 from DocumentTemplate import HTML
@@ -141,5 +140,13 @@
             assert 0, "Raised overflow error erroneously"
 
 
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest( unittest.makeSuite( SecurityTests ) )
+    return suite
 
-framework()
+def main():
+    unittest.TextTestRunner().run(test_suite())
+
+if __name__ == '__main__':
+    main()

=== Removed File Zope/lib/python/AccessControl/tests/framework.py ===