From fca8dc08a0a3a310164e950c254a48bcce14d9f1 Mon Sep 17 00:00:00 2001 From: Dan Berindei Date: Tue, 25 Feb 2014 10:30:21 +0200 Subject: [PATCH] Move more random failing tests to the unstable group * ISPN-3631 - o.i.persistence.support.AsyncStoreEvictionTest * ISPN-3994 - o.i.rest.IntegrationTest * ISPN-4023 - o.i.server.test.rest.RESTCertSecurityTest * ISPN-4026 - o.i.server.test.configs.ExampleConfigsTest * ISPN-4017 - o.i.client.hotrod.BaseBulkGetKeysTest * ISPN-4057 - o.i.server.test.clusteredcache.ClusteredCacheConfigurationTest * ISPN-4058 - o.i.test.integration.as.cdi.GreetingServiceIT * ISPN-4029 - o.i.commons.util.concurrent.NotifyingFutureTest --- .../java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java | 3 ++- .../commons/util/concurrent/NotifyingFutureTest.java | 1 + .../infinispan/persistence/support/AsyncStoreEvictionTest.java | 1 + .../infinispan/test/integration/as/cdi/GreetingServiceIT.java | 3 +++ .../test/clusteredcache/ClusteredCacheConfigurationTest.java | 1 + .../org/infinispan/server/test/configs/ExampleConfigsTest.java | 3 +++ .../server/test/rest/security/RESTCertSecurityTest.java | 3 +++ .../src/test/scala/org/infinispan/rest/IntegrationTest.scala | 2 +- 8 files changed, 15 insertions(+), 2 deletions(-) diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java index 3aa7d7d950f1..7efe35edc3cc 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BaseBulkGetKeysTest.java @@ -52,7 +52,7 @@ protected void createCacheManagers() throws Throwable { remoteCache = remoteCacheManager.getCache(); }; - @AfterClass + @AfterClass(alwaysRun = true) public void release() { killRemoteCacheManager(remoteCacheManager); killServers(hotrodServers); @@ -73,6 +73,7 @@ public void testBulkGetKeys() { } } + @Test(groups = "unstable", description = "See ISPN-4017") public void testBulkGetAfterLifespanExpire() throws InterruptedException { Map dataIn = new HashMap(); dataIn.put("aKey", "aValue"); diff --git a/core/src/test/java/org/infinispan/commons/util/concurrent/NotifyingFutureTest.java b/core/src/test/java/org/infinispan/commons/util/concurrent/NotifyingFutureTest.java index 251e3ea852e5..80fc2704934d 100644 --- a/core/src/test/java/org/infinispan/commons/util/concurrent/NotifyingFutureTest.java +++ b/core/src/test/java/org/infinispan/commons/util/concurrent/NotifyingFutureTest.java @@ -42,6 +42,7 @@ public void testDoneOtherThread2() throws ExecutionException, InterruptedExcepti testDoneOtherThread(0, 100); } + @Test(groups = "unstable", description = "See ISPN-4029") public void testExceptionOtherThread1() throws ExecutionException, InterruptedException { testExceptionOtherThread(100, 0); } diff --git a/core/src/test/java/org/infinispan/persistence/support/AsyncStoreEvictionTest.java b/core/src/test/java/org/infinispan/persistence/support/AsyncStoreEvictionTest.java index aabe8f9000d2..5ebfa533d45e 100644 --- a/core/src/test/java/org/infinispan/persistence/support/AsyncStoreEvictionTest.java +++ b/core/src/test/java/org/infinispan/persistence/support/AsyncStoreEvictionTest.java @@ -277,6 +277,7 @@ public void call() { }); } + @Test(groups = "unstable", description = "See ISPN-3631") public void testSizeAfterRemoveAndExpiration() throws Exception { TestingUtil.withCacheManager(new CacheCallable(config(false, 1)) { @Override diff --git a/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/cdi/GreetingServiceIT.java b/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/cdi/GreetingServiceIT.java index 6eb34bca987c..6f5fe60c2ec6 100644 --- a/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/cdi/GreetingServiceIT.java +++ b/integrationtests/as-integration/src/test/java/org/infinispan/test/integration/as/cdi/GreetingServiceIT.java @@ -1,11 +1,13 @@ package org.infinispan.test.integration.as.cdi; +import org.infinispan.test.integration.as.category.UnstableTest; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.experimental.categories.Category; import javax.cache.annotation.CacheKey; import javax.inject.Inject; @@ -17,6 +19,7 @@ * @author Kevin Pollet (C) 2011 */ @RunWith(Arquillian.class) +@Category(UnstableTest.class) // See ISPN-4058 public class GreetingServiceIT { @Deployment diff --git a/server/integration/testsuite/src/test/java/org/infinispan/server/test/clusteredcache/ClusteredCacheConfigurationTest.java b/server/integration/testsuite/src/test/java/org/infinispan/server/test/clusteredcache/ClusteredCacheConfigurationTest.java index 15b27b37d1c6..6d902687b624 100644 --- a/server/integration/testsuite/src/test/java/org/infinispan/server/test/clusteredcache/ClusteredCacheConfigurationTest.java +++ b/server/integration/testsuite/src/test/java/org/infinispan/server/test/clusteredcache/ClusteredCacheConfigurationTest.java @@ -87,6 +87,7 @@ public void testNumOwners() throws Exception { // test queue-flush-interval=3000 (ms) with memcached @Test + @Category(UnstableTest.class) // See ISPN-4057 public void testQueueFlushIntervalMemcached() throws Exception { final MemcachedClient mc1 = new MemcachedClient(server1.getMemcachedEndpoint().getInetAddress().getHostName(), server1.getMemcachedEndpoint() .getPort()); diff --git a/server/integration/testsuite/src/test/java/org/infinispan/server/test/configs/ExampleConfigsTest.java b/server/integration/testsuite/src/test/java/org/infinispan/server/test/configs/ExampleConfigsTest.java index adcc576d41e3..7b1e480a6b30 100644 --- a/server/integration/testsuite/src/test/java/org/infinispan/server/test/configs/ExampleConfigsTest.java +++ b/server/integration/testsuite/src/test/java/org/infinispan/server/test/configs/ExampleConfigsTest.java @@ -48,6 +48,7 @@ import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; import org.infinispan.client.hotrod.exceptions.TransportException; +import org.infinispan.server.test.category.UnstableTest; import org.infinispan.server.test.client.memcached.MemcachedClient; import org.infinispan.server.test.client.rest.RESTHelper; import org.infinispan.server.test.util.RemoteCacheManagerFactory; @@ -63,6 +64,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.experimental.categories.Category; import static org.infinispan.server.test.client.rest.RESTHelper.*; import static org.infinispan.server.test.util.TestUtil.eventually; @@ -76,6 +78,7 @@ * @author Galder Zamarreño (galderz@redhat.com) * @author Michal Linhard (mlinhard@redhat.com) */ +@Category(UnstableTest.class) // See ISPN-4026 @RunWith(Arquillian.class) public class ExampleConfigsTest { diff --git a/server/integration/testsuite/src/test/java/org/infinispan/server/test/rest/security/RESTCertSecurityTest.java b/server/integration/testsuite/src/test/java/org/infinispan/server/test/rest/security/RESTCertSecurityTest.java index 4a5b6a1288a2..a9f79f58bdc8 100644 --- a/server/integration/testsuite/src/test/java/org/infinispan/server/test/rest/security/RESTCertSecurityTest.java +++ b/server/integration/testsuite/src/test/java/org/infinispan/server/test/rest/security/RESTCertSecurityTest.java @@ -36,6 +36,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.infinispan.arquillian.core.InfinispanResource; import org.infinispan.arquillian.core.RemoteInfinispanServer; +import org.infinispan.server.test.category.UnstableTest; import org.jboss.arquillian.container.test.api.Config; import org.jboss.arquillian.container.test.api.ContainerController; import org.jboss.arquillian.junit.Arquillian; @@ -44,6 +45,7 @@ import org.jboss.security.JBossJSSESecurityDomain; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.experimental.categories.Category; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; @@ -80,6 +82,7 @@ * * @author Martin Gencur */ +@Category(UnstableTest.class) // See ISPN-4023 @RunWith(Arquillian.class) public class RESTCertSecurityTest { diff --git a/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala b/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala index 671afc60c580..84dfa39995da 100644 --- a/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala +++ b/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala @@ -36,7 +36,7 @@ import javax.ws.rs.core.CacheControl * @author Michal Linhard * @since 4.0 */ -@Test(groups = Array("functional"), testName = "rest.IntegrationTest") +@Test(groups = Array("unstable"), testName = "rest.IntegrationTest", description = "See ISPN-3994, original group: functional") class IntegrationTest extends RestServerTestBase { private lazy val log: JavaLog = LogFactory.getLog(getClass, classOf[JavaLog])