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/21 15:33:32 UTC
[lucene-solr] branch reference_impl_dev updated: @1365 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 01b2438 @1365 Test hardening.
01b2438 is described below
commit 01b2438bff05fe8b0ff780ac4950084665f14b6a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Feb 21 09:33:08 2021 -0600
@1365 Test hardening.
Took 11 minutes
---
solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java | 4 ++--
.../test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java | 5 -----
solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 2 +-
solr/test-framework/src/java/org/apache/solr/SolrTestUtil.java | 2 +-
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java b/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
index 0d19779..31f1159 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
@@ -36,14 +36,14 @@ public class TestDistributedMap extends SolrTestCaseJ4 {
protected static ZkTestServer zkServer;
@BeforeClass
- public static void setUpClass() throws Exception {
+ public static void setTestDistributedMap() throws Exception {
zkDir = SolrTestUtil.createTempDir("TestDistributedMap");
zkServer = new ZkTestServer(zkDir);
zkServer.run();
}
@AfterClass
- public static void tearDownClass() throws IOException, InterruptedException {
+ public static void afterTestDistributedMap() throws IOException, InterruptedException {
if (zkServer != null) {
zkServer.shutdown();
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java b/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java
index c491fb0..740ef83 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSizeLimitedDistributedMap.java
@@ -28,11 +28,6 @@ import org.junit.BeforeClass;
public class TestSizeLimitedDistributedMap extends TestDistributedMap {
- @BeforeClass
- public static void setupCluster() throws Exception {
-
- }
-
public void testCleanup() throws Exception {
final List<String> deletedItems = new LinkedList<>();
final Set<String> expectedKeys = new HashSet<>();
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 8a90267..3b12b8c 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -705,7 +705,7 @@ public class SolrTestCase extends Assert {
if (thread.getName().contains(ParWork.ROOT_EXEC_NAME + "-")) {
log.warn("interrupt on {}", thread.getName());
try {
- thread.join(100);
+ thread.join(150);
} catch (InterruptedException e) {
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestUtil.java b/solr/test-framework/src/java/org/apache/solr/SolrTestUtil.java
index 7e59dec..16c065e 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestUtil.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestUtil.java
@@ -174,7 +174,7 @@ public class SolrTestUtil {
do {
log.warn("waiting on {} {}", thread.getName(), thread.getState());
try {
- thread.join(50);
+ thread.join(100);
} catch (InterruptedException e) {
}