diff options
| -rwxr-xr-x | qpid/cpp/src/tests/cluster_tests.py | 2 | ||||
| -rwxr-xr-x | qpid/tools/src/py/qpid-cluster | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index 99474da2f2..8b316f1072 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/cpp/src/tests/cluster_tests.py @@ -435,7 +435,7 @@ class StoreTests(BrokerTest): def stop_cluster(self,broker): """Clean shut-down of a cluster""" self.assertEqual(0, qpid_cluster.main( - ["qpid-cluster", "-kf", broker.host_port()])) + ["-kf", broker.host_port()])) def test_persistent_restart(self): """Verify persistent cluster shutdown/restart scenarios""" diff --git a/qpid/tools/src/py/qpid-cluster b/qpid/tools/src/py/qpid-cluster index aabf460da0..312d59f670 100755 --- a/qpid/tools/src/py/qpid-cluster +++ b/qpid/tools/src/py/qpid-cluster @@ -232,7 +232,7 @@ class BrokerManager: self.qmf.delBroker(broker) def main(argv=None): - if argv is None: argv = sys.argv + try: config = Config() @@ -247,11 +247,11 @@ def main(argv=None): parser.add_option("-k", "--all-stop", action="store_true", default=False, help="Shut down the whole cluster") parser.add_option("-f", "--force", action="store_true", default=False, help="Suppress the 'are you sure' prompt") parser.add_option("-n", "--numeric", action="store_true", default=False, help="Don't resolve names") - - opts, args = parser.parse_args() + + opts, args = parser.parse_args(args=argv) if args: - _host = args[0] + config._host = args[0] if opts.timeout != 0: config._connTimeout = opts.timeout |