diff options
| author | Jonathan Robie <jonathan@apache.org> | 2010-12-10 18:23:06 +0000 |
|---|---|---|
| committer | Jonathan Robie <jonathan@apache.org> | 2010-12-10 18:23:06 +0000 |
| commit | b1109b6e332a23687ce2f73d162a071e19945f92 (patch) | |
| tree | 25b9390c7d2a1ac565d9bd9f93fbf556c064e2a3 | |
| parent | 8fae3ea41cbbb91da898de8666adebacdce7ca7a (diff) | |
| download | qpid-python-b1109b6e332a23687ce2f73d162a071e19945f92.tar.gz | |
Modified qpid-cluster to support the way it is called from
cluster_tests.StoreTests.test_persistent_partial_failure.
Corrected test_persistent_partial_failure so that it no longer sends the name of the script as the first parameter - optparse expects this for arguments from sys.argv, but not for other argument lists.
Fixed bug assigning host name.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1044468 13f79535-47bb-0310-9956-ffa450edef68
| -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 |