[infinispan-commits] Infinispan SVN: r901 - in trunk/core/src/test/java/org/infinispan/distribution: rehash and 1 other directory.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Oct 1 12:38:39 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-10-01 12:38:37 -0400 (Thu, 01 Oct 2009)
New Revision: 901
Modified:
trunk/core/src/test/java/org/infinispan/distribution/AsyncAPISyncDistTest.java
trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistAsyncFuncTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxUnsafeFuncTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistAsyncUnsafeFuncTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreNotSharedTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreSharedTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistSyncFuncTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistSyncTxUnsafeFuncTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistSyncUnsafeFuncTest.java
trunk/core/src/test/java/org/infinispan/distribution/DistributionManagerUnitTest.java
trunk/core/src/test/java/org/infinispan/distribution/JoinTaskTest.java
trunk/core/src/test/java/org/infinispan/distribution/MagicKeyTest.java
trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinTest.java
trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentNonOverlappingLeaveTest.java
trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentOverlappingLeaveTest.java
trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java
trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java
trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleLeaveTest.java
Log:
Enabled dist tests agian
Modified: trunk/core/src/test/java/org/infinispan/distribution/AsyncAPISyncDistTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/AsyncAPISyncDistTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/AsyncAPISyncDistTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -25,7 +25,7 @@
c2 = l.get(1);
// wait for any rehashing to complete
- BaseDistFunctionalTest.waitForInitRehashToComplete(c1, c2);
+ BaseDistFunctionalTest.RehashWaiter.waitForInitRehashToComplete(c1, c2);
}
@Override
Modified: trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -22,10 +22,10 @@
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
+import static java.util.concurrent.TimeUnit.SECONDS;
import java.util.concurrent.locks.LockSupport;
-import static java.util.concurrent.TimeUnit.SECONDS;
- at Test(groups = "functional", testName = "distribution.BaseDistFunctionalTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.BaseDistFunctionalTest")
public abstract class BaseDistFunctionalTest extends MultipleCacheManagersTest {
protected String cacheName;
protected Cache<Object, String> c1, c2, c3, c4;
@@ -59,18 +59,24 @@
cacheAddresses = new ArrayList<Address>(4);
for (Cache cache : caches) cacheAddresses.add(cache.getCacheManager().getAddress());
- waitForInitRehashToComplete(c1, c2, c3, c4);
+ RehashWaiter.waitForInitRehashToComplete(c1, c2, c3, c4);
}
- public static void waitForInitRehashToComplete(Cache... caches) {
- int gracetime = 60000; // 60 seconds?
- long giveup = System.currentTimeMillis() + gracetime;
- for (Cache c: caches) {
- DistributionManagerImpl dmi = (DistributionManagerImpl) TestingUtil.extractComponent(c, DistributionManager.class);
- while (!dmi.joinComplete) {
- if (System.currentTimeMillis() > giveup) throw new RuntimeException("Timed out waiting for initial join sequence to complete!");
- LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(1));
+ /**
+ * This is a separate class because some tools try and run this method as a test
+ */
+ public static class RehashWaiter {
+ public static void waitForInitRehashToComplete(Cache... caches) {
+ int gracetime = 60000; // 60 seconds?
+ long giveup = System.currentTimeMillis() + gracetime;
+ for (Cache c : caches) {
+ DistributionManagerImpl dmi = (DistributionManagerImpl) TestingUtil.extractComponent(c, DistributionManager.class);
+ while (!dmi.joinComplete) {
+ if (System.currentTimeMillis() > giveup)
+ throw new RuntimeException("Timed out waiting for initial join sequence to complete!");
+ LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(1));
+ }
}
}
}
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistAsyncFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistAsyncFuncTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistAsyncFuncTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -10,7 +10,7 @@
import java.util.HashMap;
import java.util.Map;
- at Test(groups = "functional", testName = "distribution.DistAsyncFuncTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistAsyncFuncTest")
public class DistAsyncFuncTest extends DistSyncFuncTest {
ReplListener r1, r2, r3, r4;
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -17,7 +17,7 @@
import java.util.Set;
import java.util.concurrent.TimeUnit;
- at Test(groups = "functional", testName = "distribution.DistAsyncTxFuncTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistAsyncTxFuncTest")
public class DistAsyncTxFuncTest extends DistSyncTxFuncTest {
ReplListener r1, r2, r3, r4;
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxUnsafeFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxUnsafeFuncTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxUnsafeFuncTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -2,7 +2,7 @@
import org.testng.annotations.Test;
- at Test(groups = "functional", testName = "distribution.DistAsyncTxUnsafeFuncTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistAsyncTxUnsafeFuncTest")
public class DistAsyncTxUnsafeFuncTest extends DistAsyncTxFuncTest {
public DistAsyncTxUnsafeFuncTest() {
sync = false;
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistAsyncUnsafeFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistAsyncUnsafeFuncTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistAsyncUnsafeFuncTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -2,7 +2,7 @@
import org.testng.annotations.Test;
- at Test(groups = "functional", testName = "distribution.DistAsyncUnsafeFuncTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistAsyncUnsafeFuncTest")
public class DistAsyncUnsafeFuncTest extends DistAsyncFuncTest {
public DistAsyncUnsafeFuncTest() {
sync = false;
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistSkipRemoteLookupTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -3,7 +3,7 @@
import static org.infinispan.context.Flag.SKIP_REMOTE_LOOKUP;
import org.testng.annotations.Test;
- at Test(groups = "functional", testName = "distribution.DistSkipRemoteLookupTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistSkipRemoteLookupTest")
public class DistSkipRemoteLookupTest extends BaseDistFunctionalTest {
public void testSkipLookupOnGet() {
MagicKey k1 = new MagicKey(c1);
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreNotSharedTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreNotSharedTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreNotSharedTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -42,7 +42,7 @@
* @author Galder Zamarreño
* @since 4.0
*/
- at Test(groups = "functional", testName = "distribution.DistSyncCacheStoreNotSharedTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistSyncCacheStoreNotSharedTest")
public class DistSyncCacheStoreNotSharedTest extends BaseDistCacheStoreTest {
private static final Log log = LogFactory.getLog(DistSyncCacheStoreNotSharedTest.class);
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreSharedTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreSharedTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistSyncCacheStoreSharedTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -40,7 +40,7 @@
* @author Galder Zamarreño
* @since 4.0
*/
- at Test(groups = "functional", testName = "distribution.DistSyncCacheStoreSharedTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistSyncCacheStoreSharedTest")
public class DistSyncCacheStoreSharedTest extends BaseDistCacheStoreTest {
public DistSyncCacheStoreSharedTest() {
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistSyncFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistSyncFuncTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistSyncFuncTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -13,7 +13,7 @@
import java.util.Map;
import java.util.Set;
- at Test(groups = "functional", testName = "distribution.DistSyncFuncTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistSyncFuncTest")
public class DistSyncFuncTest extends BaseDistFunctionalTest {
public DistSyncFuncTest() {
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistSyncTxFuncTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -8,7 +8,7 @@
import javax.transaction.TransactionManager;
- at Test(groups = "functional", testName = "distribution.DistSyncTxFuncTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistSyncTxFuncTest")
public class DistSyncTxFuncTest extends BaseDistFunctionalTest {
public DistSyncTxFuncTest() {
sync = true;
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistSyncTxUnsafeFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistSyncTxUnsafeFuncTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistSyncTxUnsafeFuncTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -2,7 +2,7 @@
import org.testng.annotations.Test;
- at Test(groups = "functional", testName = "distribution.DistSyncTxUnsafeFuncTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistSyncTxUnsafeFuncTest")
public class DistSyncTxUnsafeFuncTest extends DistSyncTxFuncTest {
public DistSyncTxUnsafeFuncTest() {
sync = true;
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistSyncUnsafeFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistSyncUnsafeFuncTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistSyncUnsafeFuncTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -2,7 +2,7 @@
import org.testng.annotations.Test;
- at Test(groups = "functional", testName = "distribution.DistSyncUnsafeFuncTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.DistSyncUnsafeFuncTest")
public class DistSyncUnsafeFuncTest extends DistSyncFuncTest {
public DistSyncUnsafeFuncTest() {
sync = true;
Modified: trunk/core/src/test/java/org/infinispan/distribution/DistributionManagerUnitTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistributionManagerUnitTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistributionManagerUnitTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -12,7 +12,7 @@
* @author Manik Surtani
* @since 4.0
*/
- at Test(groups = "unit", testName = "distribution.DistributionManagerUnitTest", enabled = false)
+ at Test(groups = "unit", testName = "distribution.DistributionManagerUnitTest")
public class DistributionManagerUnitTest {
DistributionManagerImpl dmi = new DistributionManagerImpl();
Modified: trunk/core/src/test/java/org/infinispan/distribution/JoinTaskTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/JoinTaskTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/JoinTaskTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -9,7 +9,7 @@
import java.util.Arrays;
import java.util.List;
- at Test(groups = "unit", testName = "distribution.JoinTaskTest", enabled = false)
+ at Test(groups = "unit", testName = "distribution.JoinTaskTest")
public class JoinTaskTest {
public void testCalculatingWhosensStateRC2() {
doTest(2);
Modified: trunk/core/src/test/java/org/infinispan/distribution/MagicKeyTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/MagicKeyTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/MagicKeyTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -2,7 +2,7 @@
import org.testng.annotations.Test;
- at Test(groups = "unit", testName = "distribution.MagicKeyTest", enabled = false)
+ at Test(groups = "unit", testName = "distribution.MagicKeyTest")
public class MagicKeyTest extends BaseDistFunctionalTest {
public void testMagicKeys() {
BaseDistFunctionalTest.MagicKey k1 = new BaseDistFunctionalTest.MagicKey(c1);
Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentJoinTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -10,7 +10,7 @@
import java.util.List;
import static java.util.concurrent.TimeUnit.SECONDS;
- at Test(groups = "functional", testName = "distribution.rehash.ConcurrentJoinTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.rehash.ConcurrentJoinTest")
public class ConcurrentJoinTest extends RehashTestBase {
List<CacheManager> joinerManagers;
Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentNonOverlappingLeaveTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentNonOverlappingLeaveTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentNonOverlappingLeaveTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -7,7 +7,7 @@
import java.util.Arrays;
- at Test(groups = "functional", testName = "distribution.rehash.ConcurrentNonOverlappingLeaveTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.rehash.ConcurrentNonOverlappingLeaveTest")
public class ConcurrentNonOverlappingLeaveTest extends RehashLeaveTestBase {
Address l1, l2;
Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentOverlappingLeaveTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentOverlappingLeaveTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/ConcurrentOverlappingLeaveTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -7,7 +7,7 @@
import java.util.Arrays;
- at Test(groups = "functional", testName = "distribution.rehash.ConcurrentOverlappingLeaveTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.rehash.ConcurrentOverlappingLeaveTest")
public class ConcurrentOverlappingLeaveTest extends RehashLeaveTestBase {
Address l1, l2;
Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -7,7 +7,7 @@
import java.util.concurrent.TimeUnit;
- at Test(groups = "functional", testName = "distribution.rehash.RehashLeaveTestBase", enabled = false)
+ at Test(groups = "functional", testName = "distribution.rehash.RehashLeaveTestBase")
public abstract class RehashLeaveTestBase extends RehashTestBase {
void waitForRehashCompletion() {
long giveupTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(60 * 2);
Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -21,7 +21,7 @@
/**
* A base test for all rehashing tests
*/
- at Test(groups = "functional", testName = "distribution.rehash.RehashTestBase", enabled = false)
+ at Test(groups = "functional", testName = "distribution.rehash.RehashTestBase")
public abstract class RehashTestBase extends BaseDistFunctionalTest {
protected RehashTestBase() {
Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -6,7 +6,7 @@
import static java.util.concurrent.TimeUnit.SECONDS;
- at Test(groups = "functional", testName = "distribution.rehash.SingleJoinTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.rehash.SingleJoinTest")
public class SingleJoinTest extends RehashTestBase {
CacheManager joinerManager;
Cache<Object, String> joiner;
Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleLeaveTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleLeaveTest.java 2009-10-01 16:14:14 UTC (rev 900)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleLeaveTest.java 2009-10-01 16:38:37 UTC (rev 901)
@@ -5,7 +5,7 @@
import org.infinispan.test.TestingUtil;
import org.testng.annotations.Test;
- at Test(groups = "functional", testName = "distribution.rehash.SingleLeaveTest", enabled = false)
+ at Test(groups = "functional", testName = "distribution.rehash.SingleLeaveTest")
public class SingleLeaveTest extends RehashLeaveTestBase {
Address leaverAddress;
More information about the infinispan-commits
mailing list