You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2022/12/16 15:36:31 UTC
[activemq-artemis] branch main updated: ARTEMIS-3993 Fixing test when libaio is loaded
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 16046b368d ARTEMIS-3993 Fixing test when libaio is loaded
16046b368d is described below
commit 16046b368d842f859f75750882c91aab493f01a9
Author: clebert <cl...@gmail.com>
AuthorDate: Fri Dec 16 10:32:29 2022 -0500
ARTEMIS-3993 Fixing test when libaio is loaded
---
.../artemis/core/config/impl/FileConfigurationParserTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
index e69bf520e1..965d4a16c4 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
@@ -37,6 +37,7 @@ import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfigu
import org.apache.activemq.artemis.core.deployers.impl.FileConfigurationParser;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.nativo.jlibaio.LibaioContext;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.ClassloadingUtil;
import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;
@@ -543,7 +544,11 @@ public class FileConfigurationParserTest extends ActiveMQTestBase {
// check that suffixes were interpreted well
Assert.assertEquals(100 * 1024 * 1024, configuration.getGlobalMaxSize());
Assert.assertEquals(10 * 1024 * 1024, configuration.getJournalFileSize());
- Assert.assertEquals(5 * 1024 * 1024, configuration.getJournalBufferSize_NIO());
+ if (LibaioContext.isLoaded()) {
+ Assert.assertEquals(5 * 1024 * 1024, configuration.getJournalBufferSize_AIO());
+ } else {
+ Assert.assertEquals(5 * 1024 * 1024, configuration.getJournalBufferSize_NIO());
+ }
}
@Test