Author: dejanb
Date: Mon Dec 6 22:28:49 2010
New Revision: 1042819
URL: http://svn.apache.org/viewvc?rev=1042819&view=rev
Log:
making a test work through the proxy
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java?rev=1042819&r1=1042818&r2=1042819&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
Mon Dec 6 22:28:49 2010
@@ -52,9 +52,12 @@ public class AMQ2764Test extends TestCas
public void testBrokerRestart() throws Exception {
- startBrokerOne();
- Thread.sleep(5000);
startBrokerTwo();
+ brokerTwo.waitUntilStarted();
+
+ startBrokerOne();
+ brokerOne.waitUntilStarted();
+
Thread.sleep(5000);
ActiveMQConnectionFactory producerConnectionFactory =
createBrokerOneConnectionFactory();
Modified:
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml?rev=1042819&r1=1042818&r2=1042819&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
(original)
+++
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
Mon Dec 6 22:28:49 2010
@@ -30,6 +30,7 @@
</destinations>
<networkConnectors>
+ <!--<networkConnector
uri="static:(http://localhost:61617?proxyHost=localhost&proxyPort=80)"
duplex="true">-->
<networkConnector uri="static:(http://localhost:61617)" duplex="true">
<staticallyIncludedDestinations>
<queue physicalName="RECONNECT.TEST.QUEUE"/>