Don't interrupt threads in this test, just report thread leak errors. Should help get past the broken (?) freebsd jvm.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1379371 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dawid Weiss 2012-08-31 08:53:00 +00:00
parent 90e692e180
commit 5d6583162d
2 changed files with 9 additions and 5 deletions

View File

@ -34,16 +34,16 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.servlet.SolrDispatchFilter; 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 * This test simply does a bunch of basic things in solrcloud mode and asserts things
* work as expected. * work as expected.
*/ */
@ThreadLeakAction({Action.WARN})
public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase { public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase {
public BasicDistributedZk2Test() {
super();
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* *

View File

@ -70,11 +70,15 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.update.SolrCmdDistributor.Request; import org.apache.solr.update.SolrCmdDistributor.Request;
import org.apache.solr.util.DefaultSolrThreadFactory; 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 * This test simply does a bunch of basic things in solrcloud mode and asserts things
* work as expected. * work as expected.
*/ */
@Slow @Slow
@ThreadLeakAction({Action.WARN})
public class BasicDistributedZkTest extends AbstractDistribZkTestBase { public class BasicDistributedZkTest extends AbstractDistribZkTestBase {
private static final String DEFAULT_COLLECTION = "collection1"; private static final String DEFAULT_COLLECTION = "collection1";