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 2021/05/19 02:32:07 UTC

[activemq-artemis] branch main updated: ARTEMIS-3297 Fixing Tests that do not support retention on the file system

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 5e622a6  ARTEMIS-3297 Fixing Tests that do not support retention on the file system
5e622a6 is described below

commit 5e622a642de656958ee539dfe7057e81c8386a17
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue May 18 22:27:39 2021 -0400

    ARTEMIS-3297 Fixing Tests that do not support retention on the file system
---
 .../tests/integration/cluster/failover/FailoverTestBase.java     | 9 +++++++--
 .../failover/ReplicatedLargeMessageWithDelayFailoverTest.java    | 5 +++++
 .../cluster/failover/ReplicatedWithDelayFailoverTest.java        | 5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
index 2731173..a3e3dfc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
@@ -185,6 +185,9 @@ public abstract class FailoverTestBase extends ActiveMQTestBase {
       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 @@ public abstract class FailoverTestBase extends ActiveMQTestBase {
 
       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/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
index bf7148f..cb6ae62 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
@@ -29,6 +29,11 @@ public class ReplicatedLargeMessageWithDelayFailoverTest extends ReplicatedLarge
    private BackupSyncDelay syncDelay;
 
    @Override
+   protected boolean supportsRetention() {
+      return false;
+   }
+
+   @Override
    @Before
    public void setUp() throws Exception {
       startBackupServer = false;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
index 97c7d49..b528da4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
@@ -28,6 +28,11 @@ public class ReplicatedWithDelayFailoverTest extends ReplicatedFailoverTest {
    private BackupSyncDelay syncDelay;
 
    @Override
+   protected boolean supportsRetention() {
+      return false;
+   }
+
+   @Override
    @Before
    public void setUp() throws Exception {
       startBackupServer = false;