diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-04-13 11:50:35 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-04 11:09:32 -0400 |
commit | 1886e7437a445cbf60dca1c8a5d3ba2fee438573 (patch) | |
tree | b49a2ecc216b12ba4edb031a83cafb892f436aa6 /src/lib | |
parent | 9f31e17f1420dca584aed5b141fbc03eed284b48 (diff) | |
download | bcfg2-1886e7437a445cbf60dca1c8a5d3ba2fee438573.tar.gz bcfg2-1886e7437a445cbf60dca1c8a5d3ba2fee438573.tar.bz2 bcfg2-1886e7437a445cbf60dca1c8a5d3ba2fee438573.zip |
merged 0106905... added ability to pass options to nose, ignore tests, test specific clients to bcfg2-test
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Options.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py index 2f535397f..b55a8a55a 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -4,6 +4,7 @@ __revision__ = '$Revision$' import getopt import os import sys +import shlex import Bcfg2.Client.Tools # Compatibility imports from Bcfg2.Bcfg2Py3k import ConfigParser @@ -348,7 +349,16 @@ CLIENT_SERVICE_MODE = Option('Set client service mode', default='default', CLIENT_TIMEOUT = Option('Set the client XML-RPC timeout', default=90, cmd='-t', cf=('communication', 'timeout'), odesc='<timeout>') - + +# bcfg2-test options +TEST_NOSEOPTS = Option('Options to pass to nosetests', default=[], + cmd='--nose-options', cf=('bcfg2_test', 'nose_options'), + odesc='<opts>', long_arg=True, cook=shlex.split) +TEST_IGNORE = Option('Ignore these entries if they fail to build.', default=[], + cmd='--ignore', + cf=('bcfg2_test', 'ignore_entries'), long_arg=True, + odesc='<Type>:<name>,<Type>:<name>', cook=list_split) + # APT client tool options CLIENT_APT_TOOLS_INSTALL_PATH = Option('Apt tools install path', cf=('APT', 'install_path'), |