[z3-checkins] r33514 - in z3/deliverance/branches/packaged: . deliverance

[ltucker at codespeak.net]

Author: ltucker
Date: Fri Oct 20 21:44:28 2006
New Revision: 33514

Modified:
   z3/deliverance/branches/packaged/deliverance/test_speed.py
   z3/deliverance/branches/packaged/deliverance/tests.py
   z3/deliverance/branches/packaged/setup.py
Log:
adjusted speed test to run from deliverance folder, added main functions to testing scripts, added testing tools to dependencies.  Should adjust these all to be independent of where they are run from at some point

Modified: z3/deliverance/branches/packaged/deliverance/test_speed.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_speed.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_speed.py	Fri Oct 20 21:44:28 2006
@@ -69,7 +69,9 @@
     parser.print_usage()
     sys.exit(0)    
     
-if __name__ == '__main__':
-    do_transform('xslt','test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','test-data/nycsr/nycsr.xml','test-data/nycsr/openplans.html')
-    do_transform('py','test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','test-data/nycsr/nycsr.xml','test-data/nycsr/openplans.html')
+def main(args=None):
+    do_transform('xslt','deliverance/test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','deliverance/test-data/nycsr/nycsr.xml','deliverance/test-data/nycsr/openplans.html')
+    do_transform('py','deliverance/test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','deliverance/test-data/nycsr/nycsr.xml','deliverance/test-data/nycsr/openplans.html')
     
+if __name__ == '__main__':
+    main()

Modified: z3/deliverance/branches/packaged/deliverance/tests.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/tests.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/tests.py	Fri Oct 20 21:44:28 2006
@@ -104,6 +104,8 @@
 
 
 
+def main(args=None):
+    import nose; nose.main() 
 
 if __name__ == '__main__':
-    import nose; nose.main() 
+    main()

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Fri Oct 20 21:44:28 2006
@@ -20,6 +20,9 @@
       install_requires=[
         'lxml',
         'paste==dev,>=0.9.9a',
+	'nose',
+	'formencode',
+	'elementtree',
 	'setuptools'
       ],
       include_package_data=True,
@@ -29,6 +32,8 @@
 
       [console_scripts]
       deliverance-proxy = deliverance.proxycommand:main
+      deliverance-tests = deliverance.tests:main
+      deliverance-speed = deliverance.test_speed:main
       """,
       )