diff options
| author | Keith Wall <kwall@apache.org> | 2014-05-21 11:05:21 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-05-21 11:05:21 +0000 |
| commit | 18db9663c7c73af9d1dc5a82478419f56f597851 (patch) | |
| tree | b8bf591fdfd85ede99bcdd6eea89766e36b355a9 /qpid/java/bdbstore/src/test | |
| parent | 6619d55f7d03e67df6f9f2956779c33d1de66776 (diff) | |
| download | qpid-python-18db9663c7c73af9d1dc5a82478419f56f597851.tar.gz | |
QPID-5715: [Java Broker] Make virtualhosts respect the states ACTIVE and STOPPED
* Add state transition tests for BDBHA virtualhostnode / virtualhost
* Prevent the BDBVHN activating the VH (this is now a responsibility of attain desired state)
* BDBHARemoteReplicationNode use state UNAVAILABLE in the case where the remote node is not MASTER or REPLICA.
Work by Andrew MacBean <andymacbean@gmail.com> and me.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1596536 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/src/test')
| -rw-r--r-- | qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java | 6 |
1 files changed, 0 insertions, 6 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 eb7cc03387..fb8d972fb3 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 @@ -143,16 +143,11 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase VirtualHostNode<?> node = createHaVHN(attributes); final CountDownLatch virtualHostAddedLatch = new CountDownLatch(1); - final CountDownLatch virtualHostStateChangeLatch = new CountDownLatch(1); node.addChangeListener(new ConfigurationChangeListener() { @Override public void stateChanged(ConfiguredObject object, State oldState, State newState) { - if (object instanceof VirtualHost) - { - virtualHostStateChangeLatch.countDown(); - } } @Override @@ -195,7 +190,6 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase assertEquals("Unexpected JE replication stream timeout", repStreamTimeout, replicationConfig.getConfigParam(ReplicationConfig.REP_STREAM_TIMEOUT)); assertTrue("Virtual host child has not been added", virtualHostAddedLatch.await(30, TimeUnit.SECONDS)); - assertTrue("Virtual host child has not had a state change", virtualHostStateChangeLatch.await(30, TimeUnit.SECONDS)); VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost(); assertNotNull("Virtual host child was not added", virtualHost); assertEquals("Unexpected virtual host name", groupName, virtualHost.getName()); |