You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2010/01/18 13:44:35 UTC
svn commit: r900372 -
/activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
Author: dejanb
Date: Mon Jan 18 12:44:34 2010
New Revision: 900372
URL: http://svn.apache.org/viewvc?rev=900372&view=rev
Log:
merging 900363 - DiscoveryNetworkReconnectTest failures
Modified:
activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
Modified: activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java?rev=900372&r1=900371&r2=900372&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java Mon Jan 18 12:44:34 2010
@@ -91,6 +91,7 @@
configure(brokerA);
brokerA.addConnector("tcp://localhost:0");
brokerA.start();
+ brokerA.waitUntilStarted();
proxy = new SocketProxy(brokerA.getTransportConnectors().get(0).getConnectUri());
managementContext = context.mock(ManagementContext.class);
@@ -146,7 +147,9 @@
@After
public void tearDown() throws Exception {
brokerA.stop();
+ brokerA.waitUntilStopped();
brokerB.stop();
+ brokerB.waitUntilStopped();
proxy.close();
}
@@ -165,6 +168,7 @@
brokerB.addNetworkConnector(discoveryAddress + "&wireFormat.maxInactivityDuration=1000&wireFormat.maxInactivityDurationInitalDelay=1000");
brokerB.start();
+ brokerB.waitUntilStarted();
doReconnect();
}
@@ -174,7 +178,8 @@
public void testSimpleReconnect() throws Exception {
brokerB.addNetworkConnector("simple://(" + proxy.getUrl()
+ ")?useExponentialBackOff=false&initialReconnectDelay=500&wireFormat.maxInactivityDuration=1000&wireFormat.maxInactivityDurationInitalDelay=1000");
- brokerB.start();
+ brokerB.start();
+ brokerB.waitUntilStarted();
doReconnect();
}
@@ -189,7 +194,7 @@
}));
// wait for network connector
- assertTrue("network connector mbean registered within 1 minute", mbeanRegistered.tryAcquire(60, TimeUnit.SECONDS));
+ assertTrue("network connector mbean registered within 2 minute", mbeanRegistered.tryAcquire(120, TimeUnit.SECONDS));
// force an inactivity timeout via the proxy
proxy.pause();