diff options
| author | Alan Conway <aconway@apache.org> | 2012-06-27 20:42:18 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-06-27 20:42:18 +0000 |
| commit | cadc80b156bbcf28fe434a000b09dd2f29279101 (patch) | |
| tree | e566670b1bc8ffa24af7bd4d98df2303c4a5a9e9 /qpid/cpp | |
| parent | a998672b062a92af993bcb89fead8f3769f407ef (diff) | |
| download | qpid-python-cadc80b156bbcf28fe434a000b09dd2f29279101.tar.gz | |
NO-JIRA: ha_tests.py raise exception for errors in qpid-ha
Refactored qpid-ha to raise exceptions if invoked via main_except
and return non-0 with an error message if invoked as a script via main
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1354717 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rwxr-xr-x | qpid/cpp/src/tests/ha_tests.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py index 4d07d386f9..ca7ee31f41 100755 --- a/qpid/cpp/src/tests/ha_tests.py +++ b/qpid/cpp/src/tests/ha_tests.py @@ -67,7 +67,9 @@ class HaBroker(Broker): def __str__(self): return Broker.__str__(self) - def qpid_ha(self, args): self.qpid_ha_script.main(["", "-b", self.host_port()]+args) + # FIXME aconway 2012-06-26: check exit status from script. + def qpid_ha(self, args): + self.qpid_ha_script.main_except(["", "-b", self.host_port()]+args) def promote(self): self.qpid_ha(["promote"]) def set_client_url(self, url): self.qpid_ha(["set", "--public-url", url]) @@ -164,7 +166,8 @@ class HaCluster(object): def update_urls(self): self.url = ",".join([b.host_port() for b in self]) - for b in self: b.set_brokers_url(self.url) + if len(self) > 1: # No failover addresses on a 1 cluster. + for b in self: b.set_brokers_url(self.url) def connect(self, i): """Connect with reconnect_urls""" |