[hornetq-commits] JBoss hornetq SVN: r11679 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication.
Author: borges
Date: 2011-11-09 09:48:11 -0500 (Wed, 09 Nov 2011)
New Revision: 11679
Modified:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java
Log:
All tests in the testcase require an up-to-date backup.
Modified:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java
===================================================================
---
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java 2011-11-09
14:36:50 UTC (rev 11678)
+++
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java 2011-11-09
14:48:11 UTC (rev 11679)
@@ -139,7 +139,10 @@
backupServer = new HornetQServerImpl(backupConfig);
locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(INVM_CONNECTOR_FACTORY));
backupServer.start();
- waitForComponent(backupServer);
+ if (backup)
+ {
+ FailoverTestBase.waitForBackup(null, 5, true, backupServer);
+ }
int count = 0;
waitForReplication(count);
}
@@ -209,7 +212,7 @@
blockOnReplication(storage, manager);
- Assert.assertEquals(0, manager.getActiveTokens().size());
+ Assert.assertTrue("Expecting no active tokens:" +
manager.getActiveTokens(), manager.getActiveTokens().isEmpty());
ServerMessage msg = new ServerMessageImpl(1, 1024);
@@ -433,7 +436,6 @@
StorageManager storage = getStorage();
manager = liveServer.getReplicationManager();
waitForComponent(manager);
- FailoverTestBase.waitForBackup(null, 5, true, backupServer);
Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);