From 2a8774f60e188c5d0f59cf1c9400cc5563c7dd8e Mon Sep 17 00:00:00 2001 From: "markrmiller@gmail.com" Date: Sat, 11 Jul 2020 01:56:20 -0500 Subject: [PATCH] #63 Push on a few tests. --- .../org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java | 4 ++-- .../apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java | 2 ++ .../test/org/apache/solr/legacy/TestNumericRangeQuery64.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java index af36e7746e7f..86285395dee5 100644 --- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java @@ -308,8 +308,8 @@ public long testIndexQueryDeleteHierarchical() throws Exception { // index long docId = 42; - int topDocsNum = atLeast(5); - int childsNum = 5+random().nextInt(5); + int topDocsNum = atLeast(TEST_NIGHTLY ? 5 : 2); + int childsNum = (TEST_NIGHTLY ? 5 : 2)+random().nextInt(TEST_NIGHTLY ? 5 : 2); for (int i = 0; i < topDocsNum; ++i) { UpdateRequest uReq = new UpdateRequest(); SolrInputDocument topDocument = new SolrInputDocument(); diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java index fb65c5896978..426a7886dd39 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java @@ -49,6 +49,7 @@ import org.apache.zookeeper.data.Stat; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -734,6 +735,7 @@ public void testPolicyAndPreferences() throws Exception { @Test // commented out on: 24-Dec-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 17-Aug-2018 + @Ignore // nocommit flakey public void testReadApi() throws Exception { CloudSolrClient solrClient = cluster.getSolrClient(); // first trigger diff --git a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java index c029e33e671b..c401bd138012 100644 --- a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java +++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java @@ -54,7 +54,7 @@ public class TestNumericRangeQuery64 extends SolrTestCase { @BeforeClass public static void beforeClass() throws Exception { - noDocs = atLeast(TEST_NIGHTLY ? 4096 : 3096); + noDocs = atLeast(4096); distance = (1L << 60) / noDocs; directory = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), directory,