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

This closes #2776

This commit is contained in:
Clebert Suconic 2019-08-01 16:15:18 -04:00
parent d77edb82a7 b1c3f52cc8
commit 6837150d5c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
View File

@ -476,6 +476,9 @@ public abstract class ActiveMQTestBase extends Assert {
protected ConfigurationImpl createBasicConfig(final int serverID) { protected ConfigurationImpl createBasicConfig(final int serverID) {
ConfigurationImpl configuration = new ConfigurationImpl().setSecurityEnabled(false).setJournalMinFiles(2).setJournalFileSize(100 * 1024).setJournalType(getDefaultJournalType()).setJournalDirectory(getJournalDir(serverID, false)).setBindingsDirectory(getBindingsDir(serverID, false)).setPagingDirectory(getPageDir(serverID, false)).setLargeMessagesDirectory(getLargeMessagesDir(serverID, false)).setJournalCompactMinFiles(0).setJournalCompactPercentage(0).setClusterPassword(CLUSTER_PASSWORD).setJournalDatasync(false); ConfigurationImpl configuration = new ConfigurationImpl().setSecurityEnabled(false).setJournalMinFiles(2).setJournalFileSize(100 * 1024).setJournalType(getDefaultJournalType()).setJournalDirectory(getJournalDir(serverID, false)).setBindingsDirectory(getBindingsDir(serverID, false)).setPagingDirectory(getPageDir(serverID, false)).setLargeMessagesDirectory(getLargeMessagesDir(serverID, false)).setJournalCompactMinFiles(0).setJournalCompactPercentage(0).setClusterPassword(CLUSTER_PASSWORD).setJournalDatasync(false);
// When it comes to the testsuite, we don't need any batching, I will leave some minimal batching to exercise the codebase
configuration.setJournalBufferTimeout_AIO(100).setJournalBufferTimeout_NIO(100);
return configuration; return configuration;
} }

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSQueueBrowserTest.java
View File

@ -260,9 +260,9 @@ public class JMSQueueBrowserTest extends JMSClientTestSupport {
browser.close(); browser.close();
// Now check that all browser work did not affect the session transaction. // Now check that all browser work did not affect the session transaction.
assertEquals(5, queueView.getMessageCount()); Wait.assertEquals(5, queueView::getMessageCount);
session.commit(); session.commit();
assertEquals(10, queueView.getMessageCount()); Wait.assertEquals(10, queueView::getMessageCount);
} }
@Test(timeout = 60000) @Test(timeout = 60000)