diff options
| author | Alex Rudyy <orudyy@apache.org> | 2014-10-02 16:17:27 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2014-10-02 16:17:27 +0000 |
| commit | 3cdc06af66e822f7b8c9a8f43afbeb29574bb5c8 (patch) | |
| tree | a9b6edd15d7d2ec64b4004d09cee154d08ca45f8 /qpid/java/bdbstore/src/test | |
| parent | c43858de586488162b0cf736e85390be14c3d5a9 (diff) | |
| download | qpid-python-3cdc06af66e822f7b8c9a8f43afbeb29574bb5c8.tar.gz | |
QPID-6126: Improve validation and exception messages for BDB HA node
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1629010 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/src/test')
2 files changed, 6 insertions, 2 deletions
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java index 16486e3564..19365a6478 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java @@ -293,6 +293,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase _helper.awaitRemoteNodes(master, 2); BDBHAVirtualHostNode<?> replica = _helper.awaitAndFindNodeInRole(NodeRole.REPLICA); + _helper.awaitRemoteNodes(replica, 2); assertNotNull("Remote node " + replica.getName() + " is not found", _helper.findRemoteNode(master, replica.getName())); replica.delete(); @@ -607,7 +608,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase catch(IllegalConfigurationException e) { assertEquals("Unexpected exception on connection to non-existing helper address", - String.format("Cannot connect to '%s'", "localhost:" + node2PortNumber), e.getMessage()); + String.format("Cannot connect to existing node '%s' at '%s'", "node2", "localhost:" + node2PortNumber), e.getMessage()); } } diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java index c12fecece3..0dc72acdb9 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java @@ -279,11 +279,14 @@ public class BDBHAVirtualHostNodeTestHelper node1Attributes.put(BDBHAVirtualHostNode.ADDRESS, address); node1Attributes.put(BDBHAVirtualHostNode.HELPER_ADDRESS, helperAddress); node1Attributes.put(BDBHAVirtualHostNode.STORE_PATH, getMessageStorePath() + File.separator + nodeName); - node1Attributes.put(BDBHAVirtualHostNode.HELPER_NODE_NAME, helperNodeNode); if (address.equals(helperAddress)) { node1Attributes.put(BDBHAVirtualHostNode.PERMITTED_NODES, getPermittedNodes(ports)); } + else + { + node1Attributes.put(BDBHAVirtualHostNode.HELPER_NODE_NAME, helperNodeNode); + } Map<String, String> context = new HashMap<String, String>(); context.put(ReplicationConfig.REPLICA_ACK_TIMEOUT, "2 s"); |