From b44c1e2972a3841b0a2b9198797ba42caddc97d4 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 26 Jun 2013 09:29:52 -0500 Subject: bcfg2-test: Fix merge thinko Signed-off-by: Sol Jerome --- src/sbin/bcfg2-test | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/sbin/bcfg2-test') 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) -- cgit v1.2.3-1-g7c22