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

ARTEMIS-2016 fix flaky test QueueControlTest#testRemoveAllWithPagingMode 

Parameters going into Wait.waitFor were originally wrong, because
`durationMillis: 3, sleepMillis: 100` means you would test the condition
only once. This commit is changing the durationMillis from 3ms to 3s,
swapping the two numbers (duration 100ms, sleep 3ms) would also be reasonable, I think.

Next, Wait.assertEquals is here being used, instead of Assert.assertTrue.

I saw the test fail only once, and never was able to reproduce it again,
but I think this commit does improve the test and so it is worthwhile.

    java.lang.AssertionError
		at org.apache.activemq.artemis.tests.integration.management.QueueControlTest.assertMetrics(QueueControlTest.java:2651)
	    at org.apache.activemq.artemis.tests.integration.management.QueueControlTest.assertMessageMetrics(QueueControlTest.java:2615)
    	at org.apache.activemq.artemis.tests.integration.management.QueueControlTest.testRemoveAllWithPagingMode(QueueControlTest.java:1554)
This commit is contained in:
Jiri Danek 2018-08-07 18:22:57 +02:00 committed by Clebert Suconic
parent 9109fc1604
commit c1a191c547
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-junit/src/main/java/org/apache/activemq/artemis/junit/Wait.java
View File

@ -52,7 +52,11 @@ public class Wait {
} }
public static void assertEquals(long size, LongCondition condition, long timeout) throws Exception { public static void assertEquals(long size, LongCondition condition, long timeout) throws Exception {
boolean result = waitFor(() -> condition.getCount() == size, timeout); assertEquals(size, condition, timeout, SLEEP_MILLIS);
}
public static void assertEquals(Long size, LongCondition condition, long timeout, long sleepMillis) throws Exception {
boolean result = waitFor(() -> condition.getCount() == size, timeout, sleepMillis);
if (!result) { if (!result) {
Assert.fail(size + " != " + condition.getCount()); Assert.fail(size + " != " + condition.getCount());

20
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
View File

@ -2632,25 +2632,25 @@ public class QueueControlTest extends ManagementTestBase {
Supplier<Number> durableCount, Supplier<Number> durableSize) throws Exception { Supplier<Number> durableCount, Supplier<Number> durableSize) throws Exception {
//make sure count stat equals message count //make sure count stat equals message count
Assert.assertTrue(Wait.waitFor(() -> count.get().longValue() == messageCount, 3, 100)); Assert.assertTrue(Wait.waitFor(() -> count.get().longValue() == messageCount, 3 * 1000, 100));
if (messageCount > 0) { if (messageCount > 0) {
//verify size stat greater than 0 //verify size stat greater than 0
Assert.assertTrue(Wait.waitFor(() -> size.get().longValue() > 0, 3, 100)); Assert.assertTrue(Wait.waitFor(() -> size.get().longValue() > 0, 3 * 1000, 100));
//If durable then make sure durable count and size are correct //If durable then make sure durable count and size are correct
if (durable) { if (durable) {
Assert.assertTrue(Wait.waitFor(() -> durableCount.get().longValue() == messageCount, 3, 100)); Wait.assertEquals(messageCount, () -> durableCount.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> durableSize.get().longValue() > 0, 3, 100)); Assert.assertTrue(Wait.waitFor(() -> durableSize.get().longValue() > 0, 3 * 1000, 100));
} else { } else {
Assert.assertTrue(Wait.waitFor(() -> durableCount.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> durableCount.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> durableSize.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> durableSize.get().longValue(), 3 * 1000, 100);
} }
} else { } else {
Assert.assertTrue(Wait.waitFor(() -> count.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> count.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> durableCount.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> durableCount.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> size.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> size.get().longValue(), 3 * 1000, 100);
Assert.assertTrue(Wait.waitFor(() -> durableSize.get().longValue() == 0, 3, 100)); Wait.assertEquals(0L, () -> durableSize.get().longValue(), 3 * 1000, 100);
} }
} }
} }