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

SOLR-13490: fix TestWaitForStateWithJettyShutdowns to use correct (randomized) JettyConfig

This commit is contained in:
Chris Hostetter 2019-06-17 15:34:14 -07:00
parent 5a974860fa
commit 7eb8703df6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
View File

@ -28,7 +28,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.apache.solr.SolrTestCaseJ4; 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.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.common.cloud.CollectionStatePredicate; import org.apache.solr.common.cloud.CollectionStatePredicate;
@ -47,7 +46,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
public void testWaitForStateAfterShutDown() throws Exception { public void testWaitForStateAfterShutDown() throws Exception {
final String col_name = "test_col"; final String col_name = "test_col";
final MiniSolrCloudCluster cluster = new MiniSolrCloudCluster final MiniSolrCloudCluster cluster = new MiniSolrCloudCluster
(1, createTempDir(), JettyConfig.builder().build()); (1, createTempDir(), buildJettyConfig("/solr"));
try { try {
log.info("Create our collection"); log.info("Create our collection");
CollectionAdminRequest.createCollection(col_name, "_default", 1, 1).process(cluster.getSolrClient()); CollectionAdminRequest.createCollection(col_name, "_default", 1, 1).process(cluster.getSolrClient());
@ -77,7 +76,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
final ExecutorService executor = ExecutorUtil.newMDCAwareFixedThreadPool final ExecutorService executor = ExecutorUtil.newMDCAwareFixedThreadPool
(1, new DefaultSolrThreadFactory("background_executor")); (1, new DefaultSolrThreadFactory("background_executor"));
final MiniSolrCloudCluster cluster = new MiniSolrCloudCluster final MiniSolrCloudCluster cluster = new MiniSolrCloudCluster
(1, createTempDir(), JettyConfig.builder().build()); (1, createTempDir(), buildJettyConfig("/solr"));
try { try {
log.info("Create our collection"); log.info("Create our collection");
CollectionAdminRequest.createCollection(col_name, "_default", 1, 1).process(cluster.getSolrClient()); CollectionAdminRequest.createCollection(col_name, "_default", 1, 1).process(cluster.getSolrClient());