You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2020/08/26 18:14:01 UTC
[lucene-solr] branch reference_impl_dev updated: Re-enable ignored
tests after fix to doParallelUpdate
This is an automated email from the ASF dual-hosted git repository.
thelabdude pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 5701b89 Re-enable ignored tests after fix to doParallelUpdate
5701b89 is described below
commit 5701b899564b49554c2055639850c1520f020867
Author: Timothy Potter <th...@gmail.com>
AuthorDate: Wed Aug 26 12:13:44 2020 -0600
Re-enable ignored tests after fix to doParallelUpdate
---
.../request/json/DirectJsonQueryRequestFacetingIntegrationTest.java | 2 +-
.../apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java | 2 --
.../solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java | 4 +---
.../org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java | 2 --
solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.java | 2 --
5 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java
index f0328a3..4d43a132 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequestFacetingIntegrationTest.java
@@ -35,7 +35,7 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit - debug
+//@Ignore // nocommit - debug
public class DirectJsonQueryRequestFacetingIntegrationTest extends SolrCloudTestCase {
private static final String COLLECTION_NAME = "techproducts";
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java
index 9ec8274..30a5546 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/HeatmapFacetMapTest.java
@@ -18,12 +18,10 @@
package org.apache.solr.client.solrj.request.json;
import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.core.StringContains.containsString;
-@Ignore // nocommit flakey
public class HeatmapFacetMapTest extends SolrTestCaseJ4 {
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java
index b99ca8b..baaba1d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java
@@ -38,10 +38,8 @@ import org.apache.solr.common.MapWriter;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.util.ExternalPaths;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit debug
public class JsonQueryRequestFacetingIntegrationTest extends SolrCloudTestCase {
private static final String COLLECTION_NAME = "techproducts";
@@ -63,7 +61,7 @@ public class JsonQueryRequestFacetingIntegrationTest extends SolrCloudTestCase {
.configure();
final List<String> solrUrls = new ArrayList<>();
- solrUrls.add(cluster.getJettySolrRunner(0).getBaseUrl().toString());
+ solrUrls.add(cluster.getJettySolrRunner(0).getBaseUrl());
CollectionAdminRequest.createCollection(COLLECTION_NAME, CONFIG_NAME, 1, 1).process(cluster.getSolrClient());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java
index 0d7de4f..03ba9b5 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/QueryFacetMapTest.java
@@ -18,12 +18,10 @@
package org.apache.solr.client.solrj.request.json;
import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.core.StringContains.containsString;
-@Ignore // nocommit - flakey
public class QueryFacetMapTest extends SolrTestCaseJ4 {
@Test
public void testSetsFacetTypeToQuery() {
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.java b/solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.java
index 5c1a809..c6153cb 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.java
@@ -21,9 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.junit.Ignore;
-@Ignore // nocommit - flakey
public class TestRetryUtil extends SolrTestCaseJ4 {
public void testRetryOnThrowable() throws Throwable {