This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 3d746d3 NO-JIRA Speeding test and intermittent failure
3d746d3 is described below
commit 3d746d3b23bf0c728754fbd540c504d0f1c2090a
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Mon Jun 29 21:39:49 2020 -0400
NO-JIRA Speeding test and intermittent failure
---
.../apache/activemq/artemis/tests/integration/jms/RedeployTest.java | 4 +++-
.../src/test/resources/reload-queue-defaults-after.xml | 1 +
.../src/test/resources/reload-queue-defaults-before.xml | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
index d4706f6..1ff0a89 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
@@ -485,6 +485,8 @@ public class RedeployTest extends ActiveMQTestBase {
deployBrokerConfig(embeddedActiveMQ, newConfig);
+ Wait.waitFor(() ->
embeddedActiveMQ.getActiveMQServer().getPostOffice()
+ .getBinding(new SimpleString("divert")) == null);
divertBinding = (DivertBinding)
embeddedActiveMQ.getActiveMQServer().getPostOffice()
.getBinding(new SimpleString("divert"));
assertNull(divertBinding);
@@ -500,7 +502,7 @@ public class RedeployTest extends ActiveMQTestBase {
Message message = session.createTextMessage("Hello world");
sourceProducer.send(message);
assertNotNull(sourceConsumer.receive(2000));
- assertNull(targetConsumer.receive(2000));
+ assertNull(targetConsumer.receiveNoWait());
}
} finally {
embeddedActiveMQ.stop();
diff --git
a/tests/integration-tests/src/test/resources/reload-queue-defaults-after.xml
b/tests/integration-tests/src/test/resources/reload-queue-defaults-after.xml
index ecc4ecd..2ea4bdf 100644
--- a/tests/integration-tests/src/test/resources/reload-queue-defaults-after.xml
+++ b/tests/integration-tests/src/test/resources/reload-queue-defaults-after.xml
@@ -25,6 +25,7 @@ under the License.
<core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled>
+
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>
diff --git
a/tests/integration-tests/src/test/resources/reload-queue-defaults-before.xml
b/tests/integration-tests/src/test/resources/reload-queue-defaults-before.xml
index 8a7521d..e6e8b63 100644
---
a/tests/integration-tests/src/test/resources/reload-queue-defaults-before.xml
+++
b/tests/integration-tests/src/test/resources/reload-queue-defaults-before.xml
@@ -25,6 +25,7 @@ under the License.
<core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled>
+
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>
