[infinispan-commits] Infinispan SVN: r1022 - trunk/core/src/test/java/org/infinispan/profiling.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-10-26 15:36:49 -0400 (Mon, 26 Oct 2009)
New Revision: 1022

Modified:
   trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java
   trunk/core/src/test/java/org/infinispan/profiling/ProfileTestSlave.java
Log:
Wait for cluster

Modified: trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java	2009-10-26 18:26:06 UTC (rev 1021)
+++ trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java	2009-10-26 19:36:49 UTC (rev 1022)
@@ -74,11 +74,13 @@
       cache = cacheManager.getCache(cacheName);
       init();
       startup();
+      if (!cacheName.equals(LOCAL_CACHE_NAME)) {
+         System.out.println("Waiting for members to join.");
+         TestingUtil.blockUntilViewReceived(cache, 2, 120000, true);
+         System.out.println("Cluster ready, cache mode is " + cache.getConfiguration().getCacheMode());
+      }
       warmup();
       doTest();
-
-      // wait for user exit
-//      System.in.read();
    }
 
    /**

Modified: trunk/core/src/test/java/org/infinispan/profiling/ProfileTestSlave.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/ProfileTestSlave.java	2009-10-26 18:26:06 UTC (rev 1021)
+++ trunk/core/src/test/java/org/infinispan/profiling/ProfileTestSlave.java	2009-10-26 19:36:49 UTC (rev 1022)
@@ -1,8 +1,9 @@
 package org.infinispan.profiling;
 
 import org.infinispan.notifications.Listener;
+import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
 import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
-import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
 @Test(groups = "profiling", enabled = false, testName = "profiling.ProfileTestSlave")
@@ -77,6 +78,9 @@
       log.warn("Starting slave, cache name = {0}", cachename);
       initTest();
       cache = cacheManager.getCache(cachename);
+      System.out.println("Waiting for members to join.");
+      TestingUtil.blockUntilViewReceived(cache, 2, 120000, true);
+      System.out.println("Cluster ready, cache mode is " + cache.getConfiguration().getCacheMode());
       System.out.println("Waiting for test completion.  Hit CTRL-C when done.");
       doTest();
       waitForTest();