You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2012/08/31 10:53:00 UTC
svn commit: r1379371 - in
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud:
BasicDistributedZk2Test.java BasicDistributedZkTest.java
Author: dweiss
Date: Fri Aug 31 08:53:00 2012
New Revision: 1379371
URL: http://svn.apache.org/viewvc?rev=1379371&view=rev
Log:
Don't interrupt threads in this test, just report thread leak errors. Should help get past the broken (?) freebsd jvm.
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java?rev=1379371&r1=1379370&r2=1379371&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java Fri Aug 31 08:53:00 2012
@@ -34,16 +34,16 @@ import org.apache.solr.common.params.Com
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.servlet.SolrDispatchFilter;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
+
/**
* This test simply does a bunch of basic things in solrcloud mode and asserts things
* work as expected.
*/
+@ThreadLeakAction({Action.WARN})
public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase {
-
- public BasicDistributedZk2Test() {
- super();
- }
-
+
/*
* (non-Javadoc)
*
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1379371&r1=1379370&r2=1379371&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Fri Aug 31 08:53:00 2012
@@ -70,11 +70,15 @@ import org.apache.solr.common.util.Named
import org.apache.solr.update.SolrCmdDistributor.Request;
import org.apache.solr.util.DefaultSolrThreadFactory;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
+
/**
* This test simply does a bunch of basic things in solrcloud mode and asserts things
* work as expected.
*/
@Slow
+@ThreadLeakAction({Action.WARN})
public class BasicDistributedZkTest extends AbstractDistribZkTestBase {
private static final String DEFAULT_COLLECTION = "collection1";