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

Fix ReplicatedLargeMessageWithDelayFailoverTest

This commit is contained in:
jbertram 2015-08-14 12:37:02 -05:00
parent 3dd9ce6b0c
commit cbebbc43fd
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
View File

@ -1941,7 +1941,6 @@ public class FailoverTest extends FailoverTestBase {
public void testBackupServerNotRemoved() throws Exception { public void testBackupServerNotRemoved() throws Exception {
// HORNETQ-720 Disabling test for replicating backups. // HORNETQ-720 Disabling test for replicating backups.
if (!(backupServer.getServer().getHAPolicy() instanceof SharedStoreSlavePolicy)) { if (!(backupServer.getServer().getHAPolicy() instanceof SharedStoreSlavePolicy)) {
waitForComponent(backupServer, 1);
return; return;
} }
locator.setFailoverOnInitialConnection(true); locator.setFailoverOnInitialConnection(true);

8
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
View File

@ -34,7 +34,13 @@ public class ReplicatedLargeMessageWithDelayFailoverTest extends ReplicatedLarge
startBackupServer = false; startBackupServer = false;
super.setUp(); super.setUp();
syncDelay = new BackupSyncDelay(backupServer, liveServer); 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 @Override