[hornetq-commits] JBoss hornetq SVN: r12090 - branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover.
Author: clebert.suconic(a)jboss.com
Date: 2012-02-06 22:16:10 -0500 (Mon, 06 Feb 2012)
New Revision: 12090
Modified:
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
Log:
fixing tests
Modified:
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
---
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2012-02-07
03:16:04 UTC (rev 12089)
+++
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2012-02-07
03:16:10 UTC (rev 12090)
@@ -138,7 +138,6 @@
backupConfig.setSharedStore(true);
backupConfig.setBackup(true);
backupConfig.setClustered(true);
- backupConfig.setMessageExpiryScanPeriod(100);
TransportConfiguration liveConnector = getConnectorTransportConfiguration(true);
TransportConfiguration backupConnector =
getConnectorTransportConfiguration(false);
backupConfig.getConnectorConfigurations().put(liveConnector.getName(),
liveConnector);
@@ -157,7 +156,6 @@
liveConfig.setSecurityEnabled(false);
liveConfig.setSharedStore(true);
liveConfig.setClustered(true);
- liveConfig.setMessageExpiryScanPeriod(100);
List<String> pairs = null;
ClusterConnectionConfiguration ccc0 = new
ClusterConnectionConfiguration("cluster1", "jms",
liveConnector.getName(), -1, false, false, 1, 1,
pairs, false);
Modified:
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
---
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2012-02-07
03:16:04 UTC (rev 12089)
+++
branches/Branch_2_2_AS7/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2012-02-07
03:16:10 UTC (rev 12090)
@@ -240,6 +240,8 @@
while (timeout > System.currentTimeMillis() &&
queue.getPageSubscription().isPaging())
{
Thread.sleep(100);
+ // Force what would happen on an expire
+ queue.expireReferences();
}
try