activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/3] activemq-artemis git commit: Fix ReplicatedLargeMessageWithDelayFailoverTest
Date Fri, 14 Aug 2015 23:49:22 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 3dd9ce6b0 -> 6665e5837


Fix ReplicatedLargeMessageWithDelayFailoverTest


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cbebbc43
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cbebbc43
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cbebbc43

Branch: refs/heads/master
Commit: cbebbc43fdde3d169ac4ef333cc1400ee5a3f274
Parents: 3dd9ce6
Author: jbertram <jbertram@apache.org>
Authored: Fri Aug 14 12:37:02 2015 -0500
Committer: jbertram <jbertram@apache.org>
Committed: Fri Aug 14 16:20:06 2015 -0500

----------------------------------------------------------------------
 .../tests/integration/cluster/failover/FailoverTest.java     | 1 -
 .../ReplicatedLargeMessageWithDelayFailoverTest.java         | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbebbc43/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index f46019c..9801a83 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -1941,7 +1941,6 @@ public class FailoverTest extends FailoverTestBase {
    public void testBackupServerNotRemoved() throws Exception {
       // HORNETQ-720 Disabling test for replicating backups.
       if (!(backupServer.getServer().getHAPolicy() instanceof SharedStoreSlavePolicy)) {
-         waitForComponent(backupServer, 1);
          return;
       }
       locator.setFailoverOnInitialConnection(true);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbebbc43/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
----------------------------------------------------------------------
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 6ff5d6b..bf7148f 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
@@ -34,7 +34,13 @@ public class ReplicatedLargeMessageWithDelayFailoverTest extends ReplicatedLarge
       startBackupServer = false;
       super.setUp();
       syncDelay = new BackupSyncDelay(backupServer, liveServer);
-      backupServer.start();
+
+      /* Using getName() here is a bit of a hack, but if the backup is started for this test
then the test will fail
+       * intermittently due to an InterruptedException.
+       */
+      if (!getName().equals("testBackupServerNotRemoved")) {
+         backupServer.start();
+      }
    }
 
    @Override


Mime
View raw message