You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2021/02/11 08:11:42 UTC
[lucene-solr] branch reference_impl_dev updated: @1348 Fix test(s).
This is an automated email from the ASF dual-hosted git repository.
markrmiller 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 00e570c @1348 Fix test(s).
00e570c is described below
commit 00e570c150ef61a32d08df0a48e6c80fc8fbf3f8
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Feb 11 02:10:46 2021 -0600
@1348 Fix test(s).
---
.../apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java | 2 --
.../org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java | 5 ++---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
index 3390af0..3faa52c 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
@@ -56,8 +56,6 @@ public class TestVariableResolverEndToEnd extends AbstractDIHJdbcTestCase {
Assert.assertTrue(response.contains("\"BEEF_CUTS_mult_s\":[\"ROUND\",\"SIRLOIN\"]"));
} catch(Exception e) {
throw e;
- } finally {
- req.close();
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
index 4a08ff5..438b9a3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
@@ -32,7 +32,6 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.SolrTestUtil;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
-import org.apache.solr.common.ParWork;
import org.apache.solr.common.cloud.CollectionStatePredicate;
import org.apache.solr.common.cloud.DocCollection;
@@ -72,7 +71,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
public void testWaitForStateBeforeShutDown() throws Exception {
final String col_name = "test_col";
- final ExecutorService executor = ParWork.getRootSharedExecutor();
+ final ExecutorService executor = getTestExecutor();
final MiniSolrCloudCluster cluster = new MiniSolrCloudCluster
(1, SolrTestUtil.createTempDir(), buildJettyConfig("/solr"));
try {
@@ -82,7 +81,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
final Future<?> backgroundWaitForState = executor.submit
(() -> {
try {
- cluster.getSolrClient().waitForState(col_name, 180, TimeUnit.SECONDS, clusterShape(1, 1));
+ cluster.getSolrClient().waitForState(col_name, 10, TimeUnit.SECONDS, clusterShape(1, 0));
} catch (Exception e) {
log.error("background thread got exception", e);
throw new RuntimeException(e);