Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-6517] resolve intermittent test failure - wait for client connection to see broker disconnect

This commit is contained in:
gtully 2017-02-22 14:35:27 +00:00
parent d53b8f8d42
commit 816f81e605
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
activemq-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
View File

@ -480,16 +480,16 @@ public class RedeliveryPolicyTest extends JmsTestSupport {
final int maxRedeliveries = 4;
for (int i=0;i<=maxRedeliveries +1;i++) {
connection = (ActiveMQConnection)factory.createConnection(userName, password);
connections.add(connection);
final ActiveMQConnection consumerConnection = (ActiveMQConnection)factory.createConnection(userName, password);
connections.add(consumerConnection);
// Receive a message with the JMS API
RedeliveryPolicy policy = connection.getRedeliveryPolicy();
RedeliveryPolicy policy = consumerConnection.getRedeliveryPolicy();
policy.setInitialRedeliveryDelay(0);
policy.setUseExponentialBackOff(false);
policy.setMaximumRedeliveries(maxRedeliveries);
connection.start();
session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
consumerConnection.start();
session = consumerConnection.createSession(true, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer = session.createConsumer(destination);
ActiveMQTextMessage m = ((ActiveMQTextMessage)consumer.receive(4000));
@ -513,11 +513,18 @@ public class RedeliveryPolicyTest extends JmsTestSupport {
transportServer.stop();
}
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return consumerConnection.isTransportFailed();
}
});
try {
connection.close();
consumerConnection.close();
} catch (Exception expected) {
} finally {
connections.remove(connection);
connections.remove(consumerConnection);
}
}
@ -553,17 +560,17 @@ public class RedeliveryPolicyTest extends JmsTestSupport {
final int maxRedeliveries = 4;
for (int i=0;i<=maxRedeliveries + 1;i++) {
connection = (ActiveMQConnection)factory.createConnection(userName, password);
connections.add(connection);
final ActiveMQConnection consumerConnection = (ActiveMQConnection)factory.createConnection(userName, password);
connections.add(consumerConnection);
// Receive a message with the JMS API
RedeliveryPolicy policy = connection.getRedeliveryPolicy();
RedeliveryPolicy policy = consumerConnection.getRedeliveryPolicy();
policy.setInitialRedeliveryDelay(0);
policy.setUseExponentialBackOff(false);
policy.setMaximumRedeliveries(maxRedeliveries);
policy.setPreDispatchCheck(false);
connection.start();
session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
consumerConnection.start();
session = consumerConnection.createSession(true, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer = session.createConsumer(destination);
ActiveMQTextMessage m = ((ActiveMQTextMessage)consumer.receive(4000));
@ -576,11 +583,18 @@ public class RedeliveryPolicyTest extends JmsTestSupport {
transportServer.stop();
}
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return consumerConnection.isTransportFailed();
}
});
try {
connection.close();
consumerConnection.close();
} catch (Exception expected) {
} finally {
connections.remove(connection);
connections.remove(consumerConnection);
}
}
}