Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1972: Ignore metrics threads in more tests 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1406075 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alan Woodward 2012-11-06 09:05:53 +00:00
parent 37cdda05f5
commit d370453c58
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
View File

@ -16,6 +16,7 @@
*/ */
package org.apache.solr; package org.apache.solr;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.util.AbstractSolrTestCase; import org.apache.solr.util.AbstractSolrTestCase;
@ -36,6 +37,9 @@ import java.util.Properties;
* *
* @since solr 1.4 * @since solr 1.4
*/ */
@ThreadLeakFilters(defaultFilters = true, filters = {
SolrIgnoredThreadsFilter.class
})
public class TestSolrCoreProperties extends LuceneTestCase { public class TestSolrCoreProperties extends LuceneTestCase {
private static final String CONF_DIR = "." + File.separator + "solr" + File.separator + "collection1" + File.separator + "conf" + File.separator; private static final String CONF_DIR = "." + File.separator + "solr" + File.separator + "collection1" + File.separator + "conf" + File.separator;
JettySolrRunner solrJetty; JettySolrRunner solrJetty;

20
solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
View File

@ -16,26 +16,32 @@
*/ */
package org.apache.solr.schema; package org.apache.solr.schema;
import java.io.File; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import java.io.FileOutputStream; import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import java.nio.ByteBuffer;
import java.util.List;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.beans.Field; import org.apache.solr.client.solrj.beans.Field;
import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer; import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.*; import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.core.SolrResourceLoader;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.RuleChain; import org.junit.rules.RuleChain;
import org.junit.rules.TestRule; import org.junit.rules.TestRule;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule; import java.io.File;
import java.io.FileOutputStream;
import java.nio.ByteBuffer;
import java.util.List;
@ThreadLeakFilters(defaultFilters = true, filters = {
SolrIgnoredThreadsFilter.class
})
public class TestBinaryField extends LuceneTestCase { public class TestBinaryField extends LuceneTestCase {
HttpSolrServer server; HttpSolrServer server;
JettySolrRunner jetty; JettySolrRunner jetty;