You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2019/10/22 09:52:14 UTC
svn commit: r1868742 - in
/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr:
configuration/DefaultAnalyzersConfigurationTest.java
server/EmbeddedSolrServerProviderTest.java
Author: mreutegg
Date: Tue Oct 22 09:52:14 2019
New Revision: 1868742
URL: http://svn.apache.org/viewvc?rev=1868742&view=rev
Log:
OAK-8244: Build failure: ThreadLeakError
Enable DefaultAnalyzersConfigurationTest again and set ThreadLeakScope to NONE on EmbeddedSolrServerProviderTest
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java?rev=1868742&r1=1868741&r2=1868742&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java Tue Oct 22 09:52:14 2019
@@ -42,7 +42,6 @@ import org.junit.runner.RunWith;
*
* Note that default Solr analyzers for Oak should be equivalent to the ones programmatically defined here.
*/
-@Ignore("OAK-8244")
@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
public class DefaultAnalyzersConfigurationTest extends BaseTokenStreamTestCase {
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java?rev=1868742&r1=1868741&r2=1868742&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java Tue Oct 22 09:52:14 2019
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
import java.net.URI;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
+
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.response.SolrPingResponse;
@@ -32,6 +34,7 @@ import static org.junit.Assert.assertNot
* Testcase for {@link EmbeddedSolrServerProvider}
*/
@RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
+@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
public class EmbeddedSolrServerProviderTest {
@Test