ARTEMIS-3297 Fixing Tests that do not support retention on the file s…

…ystem
apache · May 19, 2021 · 5e622a6 · 5e622a6
1 parent e06555b
commit 5e622a6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/...java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java b/...java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
@@ -185,6 +185,9 @@ protected NodeManager createReplicatedBackupNodeManager(Configuration backupConf
       return new InVMNodeManager(true, backupConfig.getJournalLocation());
    }
 
+   protected boolean supportsRetention() {
+      return true;
+   }
 
    protected void createReplicatedConfigs() throws Exception {
       final TransportConfiguration liveConnector = getConnectorTransportConfiguration(true);
@@ -207,8 +210,10 @@ protected void createReplicatedConfigs() throws Exception {
 
       liveServer = createTestableServer(liveConfig);
 
-      liveServer.getServer().getConfiguration().setJournalRetentionDirectory(getJournalDir(0, false) + "_retention");
-      backupServer.getServer().getConfiguration().setJournalRetentionDirectory(getJournalDir(0, true) + "_retention");
+      if (supportsRetention()) {
+         liveServer.getServer().getConfiguration().setJournalRetentionDirectory(getJournalDir(0, false) + "_retention");
+         backupServer.getServer().getConfiguration().setJournalRetentionDirectory(getJournalDir(0, true) + "_retention");
+      }
    }
 
    protected void setupHAPolicyConfiguration() {

diff --git a/...temis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java b/...temis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
@@ -28,6 +28,11 @@ public class ReplicatedLargeMessageWithDelayFailoverTest extends ReplicatedLarge
 
    private BackupSyncDelay syncDelay;
 
+   @Override
+   protected boolean supportsRetention() {
+      return false;
+   }
+
    @Override
    @Before
    public void setUp() throws Exception {

diff --git a/.../activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java b/.../activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
@@ -27,6 +27,11 @@ public class ReplicatedWithDelayFailoverTest extends ReplicatedFailoverTest {
 
    private BackupSyncDelay syncDelay;
 
+   @Override
+   protected boolean supportsRetention() {
+      return false;
+   }
+
    @Override
    @Before
    public void setUp() throws Exception {