summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-04-13 11:50:35 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-04-13 11:57:13 -0400
commit0106905765ae0305aab5697a170c4609b6a23fa3 (patch)
tree6dc319de87afb1d615f0bee909cc482302b1dc38 /src/lib
parentdc93e75761bc73df97245152002494804248432e (diff)
downloadbcfg2-0106905765ae0305aab5697a170c4609b6a23fa3.tar.gz
bcfg2-0106905765ae0305aab5697a170c4609b6a23fa3.tar.bz2
bcfg2-0106905765ae0305aab5697a170c4609b6a23fa3.zip
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/Bcfg2/Options.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 6a6b83d61..f6273924a 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -3,6 +3,7 @@
import getopt
import os
import sys
+import shlex
import Bcfg2.Client.Tools
# Compatibility imports
from Bcfg2.Bcfg2Py3k import ConfigParser
@@ -353,6 +354,15 @@ 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'),