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

ARTEMIS-1753 Fixing intermittent failure on OldAddressSpaceTest

This commit is contained in:
Clebert Suconic 2018-03-22 14:58:46 -04:00
parent e26c051617
commit 37657f22fa
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/compatibility-tests/src/main/resources/oldAddressSpace/artemisServer.groovy
View File

@ -1,4 +1,4 @@
package servers package oldAddressSpace
import org.apache.activemq.artemis.api.core.RoutingType import org.apache.activemq.artemis.api.core.RoutingType
import org.apache.activemq.artemis.api.core.SimpleString import org.apache.activemq.artemis.api.core.SimpleString

4
tests/compatibility-tests/src/main/resources/oldAddressSpace/receiveMessages.groovy
View File

@ -1,4 +1,4 @@
package meshTest package oldAddressSpace
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory
import org.apache.activemq.artemis.tests.compatibility.GroovyRun import org.apache.activemq.artemis.tests.compatibility.GroovyRun
@ -46,6 +46,8 @@ System.out.println("Receiving...");
MessageConsumer topicConsumer = session.createDurableSubscriber(topic, "myDurableSub") MessageConsumer topicConsumer = session.createDurableSubscriber(topic, "myDurableSub")
MessageConsumer queueConsumer = session.createConsumer(queue) MessageConsumer queueConsumer = session.createConsumer(queue)
subscriptionCreated.countDown();
connection.start() connection.start()
for (int i = 0; i < 500; i++) { for (int i = 0; i < 500; i++) {
BytesMessage bytesMessage = (BytesMessage) queueConsumer.receive(5000); BytesMessage bytesMessage = (BytesMessage) queueConsumer.receive(5000);

2
tests/compatibility-tests/src/main/resources/oldAddressSpace/sendMessagesAddress.groovy
View File

@ -1,4 +1,4 @@
package meshTest package oldAddressSpace
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory

10
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java
View File

@ -63,10 +63,12 @@ public class OldAddressSpaceTest extends VersionedBaseTest {
public void testClientSenderServerAddressSettings() throws Throwable { public void testClientSenderServerAddressSettings() throws Throwable {
evaluate(serverClassloader, "oldAddressSpace/artemisServer.groovy", serverFolder.getRoot().getAbsolutePath(), server); evaluate(serverClassloader, "oldAddressSpace/artemisServer.groovy", serverFolder.getRoot().getAbsolutePath(), server);
CountDownLatch subscriptionCreated = new CountDownLatch(1);
CountDownLatch receiverLatch = new CountDownLatch(1); CountDownLatch receiverLatch = new CountDownLatch(1);
CountDownLatch senderLatch = new CountDownLatch(1); CountDownLatch senderLatch = new CountDownLatch(1);
setVariable(receiverClassloader, "latch", receiverLatch); setVariable(receiverClassloader, "latch", receiverLatch);
setVariable(receiverClassloader, "subscriptionCreated", subscriptionCreated);
AtomicInteger errors = new AtomicInteger(0); AtomicInteger errors = new AtomicInteger(0);
Thread t1 = new Thread() { Thread t1 = new Thread() {
@ -75,12 +77,15 @@ public class OldAddressSpaceTest extends VersionedBaseTest {
try { try {
evaluate(receiverClassloader, "oldAddressSpace/receiveMessages.groovy", receiver); evaluate(receiverClassloader, "oldAddressSpace/receiveMessages.groovy", receiver);
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace();
errors.incrementAndGet(); errors.incrementAndGet();
} }
} }
}; };
t1.start(); t1.start();
Assert.assertTrue(subscriptionCreated.await(10, TimeUnit.SECONDS));
setVariable(senderClassloader, "senderLatch", senderLatch); setVariable(senderClassloader, "senderLatch", senderLatch);
Thread t2 = new Thread() { Thread t2 = new Thread() {
@Override @Override
@ -88,6 +93,7 @@ public class OldAddressSpaceTest extends VersionedBaseTest {
try { try {
evaluate(senderClassloader, "oldAddressSpace/sendMessagesAddress.groovy", sender); evaluate(senderClassloader, "oldAddressSpace/sendMessagesAddress.groovy", sender);
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace();
errors.incrementAndGet(); errors.incrementAndGet();
} }
} }
@ -96,8 +102,8 @@ public class OldAddressSpaceTest extends VersionedBaseTest {
try { try {
Assert.assertTrue("Sender is blocking by mistake", senderLatch.await(100, TimeUnit.SECONDS)); Assert.assertTrue("Sender is blocking by mistake", senderLatch.await(10, TimeUnit.SECONDS));
Assert.assertTrue("Receiver did not receive messages", receiverLatch.await(100, TimeUnit.SECONDS)); Assert.assertTrue("Receiver did not receive messages", receiverLatch.await(10, TimeUnit.SECONDS));
} finally { } finally {
t1.join(TimeUnit.SECONDS.toMillis(1)); t1.join(TimeUnit.SECONDS.toMillis(1));