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/25 08:35:02 UTC
[lucene-solr] branch reference_impl_dev updated: @1392 Test
hardening.
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 77fe2ae @1392 Test hardening.
77fe2ae is described below
commit 77fe2aedd721171e8658bf763c90640e6508fc10
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Feb 25 02:34:33 2021 -0600
@1392 Test hardening.
Took 23 minutes
---
.../org/apache/solr/handler/dataimport/TestDataConfig.java | 6 ++++++
.../src/test/org/apache/solr/cloud/DeleteShardTest.java | 8 --------
.../component/DistributedQueryComponentCustomSortTest.java | 8 +++++++-
.../component/SuggestComponentContextFilterQueryTest.java | 2 +-
.../schema/analysis/TestManagedSynonymFilterFactory.java | 6 +++++-
.../test/org/apache/solr/search/TestValueSourceCache.java | 5 +++++
.../java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
.../src/java/org/apache/solr/SolrJettyTestBase.java | 14 ++++++++------
8 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
index 89223e8..a16be89 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
@@ -17,6 +17,7 @@
package org.apache.solr.handler.dataimport;
import org.apache.solr.handler.dataimport.config.DIHConfiguration;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -41,6 +42,11 @@ public class TestDataConfig extends AbstractDataImportHandlerTestCase {
initCore("dataimport-nodatasource-solrconfig.xml", "dataimport-schema.xml");
}
+ @AfterClass
+ public static void afterTestDataConfig() throws Exception {
+ deleteCore();
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testDataConfigWithDataSource() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
index 4cefad7..931694e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.cloud;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestUtil;
@@ -34,7 +33,6 @@ import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.Slice.State;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
-import org.apache.solr.common.util.TimeSource;
import org.apache.solr.common.util.Utils;
import org.apache.solr.util.FileUtils;
import org.junit.After;
@@ -100,12 +98,6 @@ public class DeleteShardTest extends SolrCloudTestCase {
ZkNodeProps m = new ZkNodeProps(propMap);
inQueue.offer(Utils.toJSON(m));
- cluster.getSolrClient().getZkStateReader().waitForState(collection, 5, TimeUnit.SECONDS, (l, c)->{
- if (c == null) return false;
- if (c.getSlice(slice) == null) return false;
-
- return c.getSlice(slice).getState() == state;
- });
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
index 6f2d2c2..9ee4470 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
@@ -18,6 +18,7 @@ package org.apache.solr.handler.component;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.response.QueryResponse;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -35,10 +36,15 @@ public class DistributedQueryComponentCustomSortTest extends BaseDistributedSear
}
@BeforeClass
- public static void setUpBeforeClass() throws Exception {
+ public static void beforeDistributedQueryComponentCustomSortTest() throws Exception {
initCore("solrconfig.xml", "schema-custom-field.xml");
}
+ @AfterClass
+ public static void afterDistributedQueryComponentCustomSortTest() throws Exception {
+ deleteCore();
+ }
+
@Test
@ShardsFixed(num = 3)
public void test() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java
index 2b91b06..01645a6 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java
@@ -47,8 +47,8 @@ public class SuggestComponentContextFilterQueryTest extends SolrTestCaseJ4 {
@Override
public void tearDown() throws Exception {
- super.tearDown();
deleteCore();
+ super.tearDown();
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
index 156d8c1..42ffe3c 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
@@ -49,13 +49,17 @@ public class TestManagedSynonymFilterFactory extends RestTestBase {
System.setProperty("managed.schema.mutable", "true");
System.setProperty("enable.update.log", "false");
- createJettyAndHarness(tmpSolrHome.getAbsolutePath(), "solrconfig-managed-schema.xml", "schema-rest.xml",
+ jetty = createJettyAndHarness(tmpSolrHome.getAbsolutePath(), "solrconfig-managed-schema.xml", "schema-rest.xml",
"/solr", true, extraServlets);
super.setUp();
}
@After
public void tearDown() throws Exception {
+ if (jetty != null) {
+ jetty.stop();
+ jetty = null;
+ }
super.tearDown();
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java b/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java
index 3ec33ba..7c289da 100644
--- a/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java
+++ b/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java
@@ -29,6 +29,10 @@ public class TestValueSourceCache extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty(SolrTestCaseJ4.NUMERIC_DOCVALUES_SYSPROP, "true");
+ System.setProperty(SolrTestCaseJ4.USE_NUMERIC_POINTS_SYSPROP, "true");
+
+ SolrTestCaseJ4.randomizeNumericTypesProperties();
initCore("solrconfig.xml", "schema.xml");
try (SolrQueryRequest req = lrf.makeRequest()) {
_func = QParser.getParser(null, FunctionQParserPlugin.NAME, req);
@@ -39,6 +43,7 @@ public class TestValueSourceCache extends SolrTestCaseJ4 {
@AfterClass
public static void afterClass() throws Exception {
+ deleteCore();
_func = null;
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 8359b07..874f4a3 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -716,7 +716,7 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
}
private void notifyCloudCollectionsListeners() {
- notifyCloudCollectionsListeners(false);
+ notifyCloudCollectionsListeners(true);
}
private void notifyCloudCollectionsListeners(boolean notifyIfSame) {
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
index b10bed6..38a0250 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
@@ -72,15 +72,17 @@ abstract public class SolrJettyTestBase extends SolrTestCaseJ4
@AfterClass
public static void afterSolrJettyTestBase() throws Exception {
- for (SolrClient client : clients) {
- IOUtils.closeQuietly(client);
- }
+ clients.forEach(solrClient -> IOUtils.closeQuietly(solrClient));
clients.clear();
IOUtils.closeQuietly(client);
- for (JettySolrRunner jetty : jettys) {
- jetty.stop();
- }
+ jettys.forEach(jettySolrRunner -> {
+ try {
+ jettySolrRunner.stop();
+ } catch (Exception e) {
+ log.warn("", e);
+ }
+ });
jettys.clear();
jetty = null;