# HG changeset patch # User dfraser # Date 1249465395 0 # Node ID 327dca35a74fb26fe09f5b06dfc3679a2739aba4 # Parent dd64ca07ecaed5e4fd1987ae97607ace408e5910 Extensions to allow running all appropriate unittests from `Bitten-Slave` distribution: * Include all the runnable test packages * Include `bitten.util.loc` - all `bitten.util` submodules should be included as `bitten.build` steps depend on them * Specify `test_suite` as `bitten.slave_tests` * Add ` unittest` distutils command * Adjust `MANIFEST-SLAVE.in` to include all neccessary modules (including `setup.py` as `setup-slave.py` now depends on it diff --git a/MANIFEST-SLAVE.in b/MANIFEST-SLAVE.in --- a/MANIFEST-SLAVE.in +++ b/MANIFEST-SLAVE.in @@ -3,20 +3,17 @@ prune doc prune scripts exclude bitten/*.py -exclude bitten/build/tests/*.py +include bitten/build/tests/*.py exclude bitten/report/*.py exclude bitten/report/tests/*.py exclude bitten/tests/*.py -exclude bitten/util/*.py -exclude bitten/util/tests/*.py -exclude setup.py +include setup.py exclude MANIFEST.in include bitten/__init__.py include bitten/build/*.py include bitten/recipe.py include bitten/slave.py -include bitten/tests/slave.py -include bitten/util/__init__.py -include bitten/util/testrunner.py -include bitten/util/xmlio.py +include bitten/slave_tests/*.py +include bitten/util/*.py +include bitten/util/tests/*.py diff --git a/setup-slave.py b/setup-slave.py --- a/setup-slave.py +++ b/setup-slave.py @@ -37,16 +37,38 @@ "bitten.build.pythontools", "bitten.build.shtools", "bitten.build.svntools", + "bitten.build.tests.__init__", + "bitten.build.tests.api", + "bitten.build.tests.config", + "bitten.build.tests.ctools", + "bitten.build.tests.dummy", + "bitten.build.tests.hgtools", + "bitten.build.tests.javatools", + "bitten.build.tests.monotools", + "bitten.build.tests.phptools", + "bitten.build.tests.pythontools", + "bitten.build.tests.xmltools", "bitten.build.xmltools", "bitten.recipe", "bitten.slave", + "bitten.slave_tests.__init__", + "bitten.slave_tests.recipe", + "bitten.slave_tests.slave", "bitten.util.__init__", + "bitten.util.loc", "bitten.util.testrunner", "bitten.util.xmlio", ], + test_suite = 'bitten.slave_tests.suite', + tests_require = [ + 'figleaf', + ], entry_points = { 'console_scripts': [ - 'bitten-slave = bitten.slave:main' + 'bitten-slave = bitten.slave:main', + ], + 'distutils.commands': [ + 'unittest = bitten.util.testrunner:unittest', ], 'bitten.recipe_commands': recipe_commands },