[lucene-solr] branch reference_impl_dev updated: @1379 Test hardening.

[ma...@apache.org]

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 40a7b54  @1379 Test hardening.
40a7b54 is described below

commit 40a7b54a2f854514c1951336acd53c6e642c4ba1
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Feb 21 19:21:21 2021 -0600

    @1379 Test hardening.
    
    Took 5 minutes
---
 .../org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java | 8 +++++++-
 solr/test-framework/src/java/org/apache/solr/SolrTestCase.java    | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java
index 1429cde..4984b5d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java
@@ -20,18 +20,24 @@ import org.apache.solr.SolrTestUtil;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
 public class DeleteLastCustomShardedReplicaTest extends SolrCloudTestCase {
 
   @Before
-  public void setupCluster() throws Exception {
+  public void beforeDeleteLastCustomShardedReplicaTest() throws Exception {
     configureCluster(2)
         .addConfig("conf", SolrTestUtil.configset("cloud-minimal"))
         .configure();
   }
 
+  @AfterClass
+  public static void afterSelectWithEvaluatorsTest() throws Exception {
+    shutdownCluster();
+  }
+
   @Test
   public void test() throws Exception {
 
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 f67b8d6..3d8975c 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -702,7 +702,8 @@ public class SolrTestCase extends Assert {
       thread.interrupt();
       return true;
     }
-    if (thread.getName().contains(ParWork.ROOT_EXEC_NAME + "-") || thread.getName().contains("ParWork-") || thread.getName().contains("Core-")) {
+    if (thread.getName().contains(ParWork.ROOT_EXEC_NAME + "-") || thread.getName().contains("ParWork-") || thread.getName().contains("Core-")
+        || thread.getName().contains("ProcessThread(")) {
       log.warn("interrupt on {}", thread.getName());
       try {
         thread.join(50);