diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-06-26 09:29:52 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-06-26 09:29:52 -0500 |
| commit | b44c1e2972a3841b0a2b9198797ba42caddc97d4 (patch) | |
| tree | d960d7d777d7e3eb5cc05523375b3f197c5ad442 | |
| parent | 8b49d8b198564d0dae3e40b99b6f9d76188dcda7 (diff) | |
| download | bcfg2-b44c1e2972a3841b0a2b9198797ba42caddc97d4.tar.gz bcfg2-b44c1e2972a3841b0a2b9198797ba42caddc97d4.tar.bz2 bcfg2-b44c1e2972a3841b0a2b9198797ba42caddc97d4.zip | |
bcfg2-test: Fix merge thinko
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rwxr-xr-x | src/sbin/bcfg2-test | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test index 54ddad6df..d32df5cfb 100755 --- a/src/sbin/bcfg2-test +++ b/src/sbin/bcfg2-test @@ -191,11 +191,6 @@ def run_child(setup, clients, queue): core.shutdown() -def parse_args(): - """ Parse command line arguments. """ - optinfo = dict(Bcfg2.Options.TEST_COMMON_OPTIONS) - - def get_sigint_handler(core): """ Get a function that handles SIGINT/Ctrl-C by shutting down the core and exiting properly.""" @@ -209,6 +204,10 @@ def get_sigint_handler(core): return hdlr +def parse_args(): + """ Parse command line arguments. """ + optinfo = dict(Bcfg2.Options.TEST_COMMON_OPTIONS) + optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) setup = Bcfg2.Options.OptionParser(optinfo) |