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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-08-14 12:23:39 -0400 (Fri, 14 Aug 2009)
New Revision: 696

Modified:
   trunk/core/src/test/java/org/infinispan/distribution/AsyncAPIAsyncDistTest.java
   trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/distribution/RehashJoinTest.java
Log:
Better timeouts for Hudson

Modified: trunk/core/src/test/java/org/infinispan/distribution/AsyncAPIAsyncDistTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/AsyncAPIAsyncDistTest.java	2009-08-14 15:31:39 UTC (rev 695)
+++ trunk/core/src/test/java/org/infinispan/distribution/AsyncAPIAsyncDistTest.java	2009-08-14 16:23:39 UTC (rev 696)
@@ -5,6 +5,8 @@
 import org.infinispan.test.ReplListener;
 import org.testng.annotations.Test;
 
+import java.util.concurrent.TimeUnit;
+
 @Test(groups = "functional", testName = "distribution.AsyncAPIAsyncDistTest")
 public class AsyncAPIAsyncDistTest extends AsyncAPISyncDistTest {
 
@@ -45,6 +47,6 @@
       }
 
 
-      rl.waitForRpc();
+      rl.waitForRpc(240, TimeUnit.SECONDS);
    }
 }
\ No newline at end of file

Modified: trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-08-14 15:31:39 UTC (rev 695)
+++ trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-08-14 16:23:39 UTC (rev 696)
@@ -68,11 +68,11 @@
       List<Cache> clist = new ArrayList<Cache>(cacheManagers.size());
       for (CacheManager cm : cacheManagers) clist.add(cm.getCache(cacheName));
       assert clist.size() == 4;
-      waitForJoinTasksToComplete(SECONDS.toMillis(240), clist.toArray(new Cache[clist.size()]));
+      waitForJoinTasksToComplete(SECONDS.toMillis(480), clist.toArray(new Cache[clist.size()]));
 
       // seed this with an initial cache.  Any one will do.
       Cache seed = caches.get(0);
-      DefaultConsistentHash ch = getDefaultConsistentHash(seed, SECONDS.toMillis(240));
+      DefaultConsistentHash ch = getDefaultConsistentHash(seed, SECONDS.toMillis(480));
       List<Cache<Object, String>> reordered = new ArrayList<Cache<Object, String>>();
 
       for (Address a : ch.positions.values()) {

Modified: trunk/core/src/test/java/org/infinispan/distribution/RehashJoinTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/RehashJoinTest.java	2009-08-14 15:31:39 UTC (rev 695)
+++ trunk/core/src/test/java/org/infinispan/distribution/RehashJoinTest.java	2009-08-14 16:23:39 UTC (rev 696)
@@ -55,10 +55,10 @@
       Cache<Object, String> joiner = joinerManager.getCache(cacheName);
 
       // need to wait for the joiner to, well, join.
-      TestingUtil.blockUntilViewsReceived(SECONDS.toMillis(240), cacheManagers.toArray(new CacheManager[cacheManagers.size()]));
+      TestingUtil.blockUntilViewsReceived(SECONDS.toMillis(480), cacheManagers.toArray(new CacheManager[cacheManagers.size()]));
 
       // need to block until this join has completed!
-      waitForJoinTasksToComplete(SECONDS.toMillis(240), joiner);
+      waitForJoinTasksToComplete(SECONDS.toMillis(480), joiner);
 
       // where does the joiner sit in relation to the other caches?
       int joinerPos = locateJoiner(joinerManager.getAddress());
@@ -139,11 +139,11 @@
       log.info("Number of cache manager views to wait for: {0}", cacheManagerArray.length);
 
       // need to wait for the joiner to, well, join.
-      TestingUtil.blockUntilViewsReceived(SECONDS.toMillis(240), cacheManagerArray);
+      TestingUtil.blockUntilViewsReceived(SECONDS.toMillis(480), cacheManagerArray);
       // where do the joiners sit in relation to the other caches?
 
 
-      waitForJoinTasksToComplete(SECONDS.toMillis(240), joiners);
+      waitForJoinTasksToComplete(SECONDS.toMillis(480), joiners);
 
       // need to wait a *short while* before we attempt to locate joiners, since post-join invalidation messages are sent async.
       // TODO replace this with some form of command detection on remote nodes.
@@ -168,7 +168,7 @@
 
    private int locateJoiner(Address joinerAddress) {
       for (Cache c : Arrays.asList(c1, c2, c3, c4)) {
-         DefaultConsistentHash dch = getDefaultConsistentHash(c, SECONDS.toMillis(240));
+         DefaultConsistentHash dch = getDefaultConsistentHash(c, SECONDS.toMillis(480));
          int i = 0;
          for (Address a : dch.positions.values()) {
             if (a.equals(joinerAddress)) return i;