-

Ram Rachum · Ram Rachum · commit cabfa433787c · 2011-02-13T22:07:34.000+02:00
diff --git a/garlicsim/test_garlicsim/scripts/__init__.py b/garlicsim/test_garlicsim/scripts/__init__.py
@@ -1,6 +1,6 @@
 # Copyright 2009-2011 Ram Rachum.
 # This program is distributed under the LGPL2.1 license.
 
-'''Testing package for `garlicsim`.'''
+'''Scripts for `test_garlicsim`.'''
 
 from . import _test_garlicsim
diff --git a/garlicsim/test_garlicsim/scripts/_test_garlicsim.py b/garlicsim/test_garlicsim/scripts/_test_garlicsim.py
@@ -3,13 +3,11 @@
 # Copyright 2009-2011 Ram Rachum.
 # This program is distributed under the LGPL2.1 license.
 
-'''
-This module defines the `` class.
+'''Script for launching `garlicsim` tests when installed in local Python.'''
 
-See its documentation for more information.
-'''
 
 import test_garlicsim
 
+
 if __name__ == '__main__':
     test_garlicsim.invoke_nose()
diff --git a/garlicsim_lib/MANIFEST.in b/garlicsim_lib/MANIFEST.in
@@ -1,3 +1,6 @@
 recursive-include garlicsim_lib *
 recursive-exclude garlicsim_lib *.pyc
-recursive-exclude garlicsim_lib *.pyo
+recursive-exclude garlicsim_lib *.pyo
+recursive-include test_garlicsim_lib *
+recursive-exclude test_garlicsim_lib *.pyc
+recursive-exclude test_garlicsim_lib *.pyo
diff --git a/garlicsim_lib/setup.py b/garlicsim_lib/setup.py
@@ -97,6 +97,7 @@ def get_packages():
     author_email='cool-rr@cool-rr.com',
     url='http://garlicsim.org',
     packages=get_packages(),
+    scripts=['test_garlicsim_lib/scripts/_test_garlicsim_lib.py'],
     license='LGPL v2.1',
     long_description = my_long_description,
     classifiers = my_classifiers,
diff --git a/garlicsim_lib/test_garlicsim_lib/__init__.py b/garlicsim_lib/test_garlicsim_lib/__init__.py
@@ -3,6 +3,15 @@
 
 '''Testing package for `garlicsim_lib`.'''
 
+import sys
+import os.path
+
+import nose
+
+
+if nose.__versioninfo__ < (1, 0, 0):
+    raise Exception('Nose version 1.0.0 or higher is required to run tests.')
+
 
 def __bootstrap():
     '''
@@ -65,4 +74,21 @@ def exists(module_name):
         sys.path.append(garlicsim_wx_candidate_path)
         
         
-__bootstrap()
+__bootstrap()
+
+
+_default_nose_arguments = [   
+    '--verbosity=3',
+    '--detailed-errors',
+    '--with-xunit',
+    '--cover-erase',
+    '--cover-package=garlicsim,garlicsim_lib,garlicsim_wx,'
+                    'test_garlicsim,test_garlicsim_lib,test_garlicsim_wx',
+    '--exe', # Needed because `setup.py` makes our test modules executable
+]
+
+
+def invoke_nose(arguments=_default_nose_arguments):
+    nose.run(defaultTest='test_garlicsim_lib',
+             argv=([sys.argv[0]] + arguments))
+    
diff --git a/garlicsim_lib/test_garlicsim_lib/scripts/__init__.py b/garlicsim_lib/test_garlicsim_lib/scripts/__init__.py
@@ -0,0 +1,6 @@
+# Copyright 2009-2011 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''Scripts for `test_garlicsim_lib`.'''
+
+from . import _test_garlicsim_lib
diff --git a/garlicsim_lib/test_garlicsim_lib/scripts/_test_garlicsim_lib.py b/garlicsim_lib/test_garlicsim_lib/scripts/_test_garlicsim_lib.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+# Copyright 2009-2011 Ram Rachum.
+# This program is distributed under the LGPL2.1 license.
+
+'''
+Script for launching `garlicsim_lib` tests when installed in local Python.
+'''
+
+import test_garlicsim_lib
+
+
+if __name__ == '__main__':
+    test_garlicsim_lib.invoke_nose()
diff --git a/garlicsim_wx/MANIFEST.in b/garlicsim_wx/MANIFEST.in
@@ -1,3 +1,6 @@
 recursive-include garlicsim_wx *
 recursive-exclude garlicsim_wx *.pyc
-recursive-exclude garlicsim_wx *.pyc
+recursive-exclude garlicsim_wx *.pyo
+recursive-include test_garlicsim_wx *
+recursive-exclude test_garlicsim_wx *.pyc
+recursive-exclude test_garlicsim_wx *.pyo
diff --git a/garlicsim_wx/setup.py b/garlicsim_wx/setup.py
@@ -32,15 +32,41 @@ def get_garlicsim_wx_packages():
     '''
     Get all the packages in `garlicsim_wx`.
     
-    This returns an answer in the form: `['garlicsim_wx.frame',
-    'garlicsim_wx.widgets', 'garlicsim_wx.misc', ...]`
+    Returns something like:
+    
+        ['garlicsim_wx', 'garlicsim_wx.app', 'garlicsim_wx.widgets', ... ]
+        
     '''
-    return ['garlicsim_wx.' + p for p
-            in setuptools.find_packages('./garlicsim_wx')] + \
+    return ['garlicsim_wx.' + p for p in
+            setuptools.find_packages('./garlicsim_wx')] + \
            ['garlicsim_wx']
 
 
-garlicsim_wx_packages = get_garlicsim_wx_packages()
+def get_test_garlicsim_wx_packages():
+    '''
+    Get all the packages in `test_garlicsim_wx`.
+    
+    Returns something like:
+    
+        ['test_garlicsim_wx', 'test_garlicsim_wx.test_import', ...]
+        
+    '''
+    return ['test_garlicsim_wx.' + p for p in
+            setuptools.find_packages('./test_garlicsim_wx')] + \
+           ['test_garlicsim_wx']
+
+
+def get_packages():
+    '''
+    Get all the packages in `garlicsim_wx` and `test_garlicsim_wx`.
+    
+    Returns something like:
+    
+        ['test_garlicsim_wx', 'garlicsim_wx', 'garlicsim_wx.app',
+        'test_garlicsim_wx.test_import', ... ]
+        
+    '''
+    return get_garlicsim_wx_packages() + get_test_garlicsim_wx_packages()
 
 
 my_long_description = \
@@ -87,8 +113,9 @@ def get_garlicsim_wx_packages():
     'author': 'Ram Rachum',
     'author_email': 'cool-rr@cool-rr.com',
     'url': 'http://garlicsim.org',
-    'packages': garlicsim_wx_packages,
-    'scripts': ['garlicsim_wx/scripts/GarlicSim.py'],
+    'packages': get_packages(),
+    'scripts': ['garlicsim_wx/scripts/GarlicSim.py',
+                'test_garlicsim_wx/scripts/_test_garlicsim_wx.py'],
     'license': 'Proprietary',
     'long_description': my_long_description,
     'classifiers': my_classifiers,
diff --git a/garlicsim_wx/test_garlicsim_wx/__init__.py b/garlicsim_wx/test_garlicsim_wx/__init__.py
@@ -3,6 +3,15 @@
 
 '''Testing package for `garlicsim_wx`.'''
 
+import sys
+import os.path
+
+import nose
+
+
+if nose.__versioninfo__ < (1, 0, 0):
+    raise Exception('Nose version 1.0.0 or higher is required to run tests.')
+
 
 def __bootstrap():
     '''
@@ -65,4 +74,20 @@ def exists(module_name):
         sys.path.append(garlicsim_wx_candidate_path)
         
         
-__bootstrap()
+__bootstrap()
+
+
+_default_nose_arguments = [   
+    '--verbosity=3',
+    '--detailed-errors',
+    '--with-xunit',
+    '--cover-erase',
+    '--cover-package=garlicsim,garlicsim_lib,garlicsim_wx,'
+                    'test_garlicsim,test_garlicsim_lib,test_garlicsim_wx',
+    '--exe', # Needed because `setup.py` makes our test modules executable
+]
+
+
+def invoke_nose(arguments=_default_nose_arguments):
+    nose.run(defaultTest='test_garlicsim_wx', argv=([sys.argv[0]] + arguments))
+    
diff --git a/garlicsim_wx/test_garlicsim_wx/scripts/__init__.py b/garlicsim_wx/test_garlicsim_wx/scripts/__init__.py
@@ -0,0 +1,6 @@
+# Copyright 2009-2011 Ram Rachum. No part of this program may be used, copied
+# or distributed without explicit written permission from Ram Rachum.
+
+'''Scripts for `test_garlicsim_wx`.'''
+
+from . import _test_garlicsim_wx
diff --git a/garlicsim_wx/test_garlicsim_wx/scripts/_test_garlicsim_wx.py b/garlicsim_wx/test_garlicsim_wx/scripts/_test_garlicsim_wx.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+# Copyright 2009-2011 Ram Rachum. No part of this program may be used, copied
+# or distributed without explicit written permission from Ram Rachum.
+
+'''Script for launching `garlicsim_wx` tests when installed in local Python.'''
+
+
+import test_garlicsim_wx
+
+
+if __name__ == '__main__':
+    test_garlicsim_wx.invoke_nose()
