diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 15:19:03 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 15:19:03 -0400 |
| commit | 1a43d45badb0c5127b75dfef436bd45af5ed916c (patch) | |
| tree | b8de6ab35e2275cae17ce6e89c3c7087b997c237 /src/sbin/bcfg2-test | |
| parent | 5bdcf1ce5fb01aeca47d36f5b96924182c950869 (diff) | |
| download | bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.tar.gz bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.tar.bz2 bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.zip | |
added option groups
Diffstat (limited to 'src/sbin/bcfg2-test')
| -rwxr-xr-x | src/sbin/bcfg2-test | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test index 7ddbb3509..653c24124 100755 --- a/src/sbin/bcfg2-test +++ b/src/sbin/bcfg2-test @@ -61,19 +61,11 @@ class ClientTest(TestCase): id = __str__ def main(): - optinfo = { - 'configfile': Bcfg2.Options.CFILE, - 'help': Bcfg2.Options.HELP, - 'encoding': Bcfg2.Options.ENCODING, - 'repo': Bcfg2.Options.SERVER_REPOSITORY, - 'plugins': Bcfg2.Options.SERVER_PLUGINS, - 'password': Bcfg2.Options.SERVER_PASSWORD, - 'verbose': Bcfg2.Options.VERBOSE, - 'noseopts': Bcfg2.Options.TEST_NOSEOPTS, - 'ignore': Bcfg2.Options.SERVER_FAM_IGNORE, - 'test_ignore': Bcfg2.Options.TEST_IGNORE, - 'validate': Bcfg2.Options.CFG_VALIDATION, - } + optinfo = dict(noseopts=Bcfg2.Options.TEST_NOSEOPTS, + test_ignore=Bcfg2.Options.TEST_IGNORE, + validate=Bcfg2.Options.CFG_VALIDATION) + optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) + optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) setup = Bcfg2.Options.OptionParser(optinfo) setup.hm = \ "bcfg2-test [options] [client] [client] [...]\nOptions:\n %s" % \ @@ -88,7 +80,7 @@ def main(): setup['plugins'], setup['password'], setup['encoding'], - filemonitor='pseudo', + filemonitor=setup['filemonitor'], setup=setup ) |