[jboss-cvs] JBossAS SVN: r62753 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-05-02 14:41:25 -0400 (Wed, 02 May 2007)
New Revision: 62753

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
Log:
[JBAS-4354] Shorten time to reconnect and merge, lengthen wait before testing merge

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java	2007-05-02 18:17:46 UTC (rev 62752)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java	2007-05-02 18:41:25 UTC (rev 62753)
@@ -71,9 +71,9 @@
    private static final String SERVICEB = "serviceB";
 	
    protected static final String CHANNEL_PROPS =
-	      "TUNNEL(router_port=4747;router_host=localhost;loopback=true):" +
+	      "TUNNEL(router_port=4747;router_host=localhost;reconnect_interval=1000;loopback=true):" +
 	      "PING(timeout=1000;num_initial_members=2;gossip_host=localhost;gossip_port=4747):" +
-	      "MERGE2(min_interval=3000;max_interval=5000):" +
+	      "MERGE2(min_interval=1000;max_interval=2000):" +
 	      "FD(timeout=1000;max_tries=2;shun=false):" +
 	      "pbcast.NAKACK(gc_lag=50;retransmit_timeout=600,1200,2400,4800):" +
 	      "UNICAST(timeout=600,1200,2400):" +
@@ -715,7 +715,7 @@
          // simulate a merge
          router.start();
          // it seems to take more than 10 seconds for the merge to take effect
-         sleepThread(15000);
+         sleepThread(25000);
          
          // confirm that each partition contains two nodes again   
          assertEquals("Partition1 should contain two nodes after merge; ",