[jboss-cvs] JBoss Messaging SVN: r3015 - trunk/tests/src/org/jboss/test/messaging/jms/clustering.

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

Author: timfox
Date: 2007-08-15 12:42:45 -0400 (Wed, 15 Aug 2007)
New Revision: 3015

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
Log:
Tweaks to clustering test base


Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java	2007-08-15 15:25:52 UTC (rev 3014)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java	2007-08-15 16:42:45 UTC (rev 3015)
@@ -123,6 +123,8 @@
              
       log.info("node count is " + nodeCount);
       
+      boolean changed = false;
+      
       if (ic != null && ic.length < nodeCount)
       {
       	log.info("Node count has increased from " + ic.length + " to " + nodeCount);
@@ -162,6 +164,8 @@
       		log.info("*** killing server");
       		ServerManagement.kill(i);
       	}
+      	
+      	changed = true;
       }
       
       if (overridesChanged(overrides, currentOverrides))
@@ -173,6 +177,8 @@
          {
       		ServerManagement.stop(i);
          }
+      	
+      	changed = true;
       }
       
       for (int i = 0; i < nodeCount; i++)
@@ -198,6 +204,8 @@
 	          
 	         queue[i] = (Queue)ic[i].lookup("queue/testDistributedQueue");
 	         topic[i] = (Topic)ic[i].lookup("topic/testDistributedTopic");
+	         
+	         changed = true;
 
 	      }
 	      
@@ -210,6 +218,13 @@
 	      ServerManagement.getServer(i).resetAllSuckers();
       }
       
+      if (changed)
+      {
+      	//Wait a little while before starting the test to ensure the new view propagates
+      	//otherwise the view change might hit after the test has started
+      	Thread.sleep(4000);
+      }
+      
       if (ic != null)
       {
       	cf = (JBossConnectionFactory)ic[0].lookup("/ClusteredConnectionFactory");