You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2014/05/26 15:03:14 UTC
svn commit: r1597578 -
/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
Author: orudyy
Date: Mon May 26 13:03:14 2014
New Revision: 1597578
URL: http://svn.apache.org/r1597578
Log:
QPID-5715: [Java Broker] Fix test BDBHAVirtualHostNodeTest.testTransferMasterToRemoteReplica
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java?rev=1597578&r1=1597577&r2=1597578&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java Mon May 26 13:03:14 2014
@@ -336,6 +336,8 @@ public class BDBHAVirtualHostNodeTest ex
assertTrue("Replication nodes have not been seen during 5s", remoteNodeLatch.await(5, TimeUnit.SECONDS));
BDBHARemoteReplicationNodeImpl replicaRemoteNode = (BDBHARemoteReplicationNodeImpl)lastSeenReplica.get();
+ awaitForAttributeChange(replicaRemoteNode, BDBHARemoteReplicationNodeImpl.ROLE, "REPLICA");
+
replicaRemoteNode.setAttributes(Collections.<String,Object>singletonMap(BDBHARemoteReplicationNode.ROLE, "MASTER"));
BDBHAVirtualHostNode<?> replica = replicaRemoteNode.getName().equals(node2.getName())? node2 : node3;
@@ -455,6 +457,17 @@ public class BDBHAVirtualHostNodeTest ex
assertEquals("Unexpected node number", expectedNodeNumber, node.getRemoteReplicationNodes().size());
}
+ private void awaitForAttributeChange(ConfiguredObject<?> object, String name, Object expectedValue) throws InterruptedException
+ {
+ int awaitCounter = 0;
+ while(!object.equals(object.getAttribute(name)) && awaitCounter < 50)
+ {
+ Thread.sleep(100);
+ awaitCounter++;
+ }
+ assertEquals("Unexpected attribute " + name + " on " + object, expectedValue, object.getAttribute(name) );
+ }
+
private BDBHAVirtualHostNode<?> awaitAndFindNodeInRole(String role) throws InterruptedException
{
BDBHAVirtualHostNode<?> replica = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org