You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2019/06/17 22:38:58 UTC
[lucene-solr] branch branch_8x updated: SOLR-13490: fix
TestWaitForStateWithJettyShutdowns to use correct (randomized) JettyConfig
This is an automated email from the ASF dual-hosted git repository.
hossman pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 592d10d SOLR-13490: fix TestWaitForStateWithJettyShutdowns to use correct (randomized) JettyConfig
592d10d is described below
commit 592d10d7ce82c9d0f38ea66f3c2f1a4113649728
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Mon Jun 17 15:34:14 2019 -0700
SOLR-13490: fix TestWaitForStateWithJettyShutdowns to use correct (randomized) JettyConfig
(cherry picked from commit 7eb8703df64b4fdda8113ddcbcd0b4d2413ecc38)
---
.../org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
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 4e21fb3..f2d16a8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
@@ -28,7 +28,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.client.solrj.embedded.JettyConfig;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.common.cloud.CollectionStatePredicate;
@@ -47,7 +46,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
public void testWaitForStateAfterShutDown() throws Exception {
final String col_name = "test_col";
final MiniSolrCloudCluster cluster = new MiniSolrCloudCluster
- (1, createTempDir(), JettyConfig.builder().build());
+ (1, createTempDir(), buildJettyConfig("/solr"));
try {
log.info("Create our collection");
CollectionAdminRequest.createCollection(col_name, "_default", 1, 1).process(cluster.getSolrClient());
@@ -77,7 +76,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
final ExecutorService executor = ExecutorUtil.newMDCAwareFixedThreadPool
(1, new DefaultSolrThreadFactory("background_executor"));
final MiniSolrCloudCluster cluster = new MiniSolrCloudCluster
- (1, createTempDir(), JettyConfig.builder().build());
+ (1, createTempDir(), buildJettyConfig("/solr"));
try {
log.info("Create our collection");
CollectionAdminRequest.createCollection(col_name, "_default", 1, 1).process(cluster.getSolrClient());