[lucene-solr] branch reference_impl_dev updated: @1374 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 0d8c2d5  @1374 Test hardening.
0d8c2d5 is described below

commit 0d8c2d5685795281390e753a68def5fa54581b01
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Feb 21 12:08:01 2021 -0600

    @1374 Test hardening.
    
    Took 6 minutes
---
 solr/core/src/test/org/apache/solr/cloud/DeleteStatusTest.java    | 6 ++++++
 solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java  | 2 ++
 solr/core/src/test/org/apache/solr/search/join/XCJFQueryTest.java | 8 +++++++-
 .../solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.java | 2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteStatusTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteStatusTest.java
index bb841de..97a2f72 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteStatusTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteStatusTest.java
@@ -26,6 +26,7 @@ import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.response.CollectionAdminResponse;
 import org.apache.solr.client.solrj.response.RequestStatusState;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -41,6 +42,11 @@ public class DeleteStatusTest extends SolrCloudTestCase {
         .formatZk(true).configure();
   }
 
+  @AfterClass
+  public static void afterDeleteStatusTest() throws Exception {
+    shutdownCluster();
+  }
+
   // Basically equivalent to RequestStatus.waitFor(), but doesn't delete the id from the queue
   private static RequestStatusState waitForRequestState(String id, SolrClient client, int timeout)
       throws IOException, SolrServerException, InterruptedException {
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 31f1159..e32b903 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
@@ -21,6 +21,7 @@ import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.Locale;
 import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.SolrTestUtil;
 import org.apache.solr.common.cloud.SolrZkClient;
@@ -29,6 +30,7 @@ import org.apache.zookeeper.KeeperException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
+@LuceneTestCase.Nightly
 public class TestDistributedMap extends SolrTestCaseJ4 {
 
   private static Path zkDir;
diff --git a/solr/core/src/test/org/apache/solr/search/join/XCJFQueryTest.java b/solr/core/src/test/org/apache/solr/search/join/XCJFQueryTest.java
index 2b64fbb..7e103b9 100644
--- a/solr/core/src/test/org/apache/solr/search/join/XCJFQueryTest.java
+++ b/solr/core/src/test/org/apache/solr/search/join/XCJFQueryTest.java
@@ -34,6 +34,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.params.ModifiableSolrParams;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -47,7 +48,7 @@ public class XCJFQueryTest extends SolrCloudTestCase {
   private static final String[] SIZES = new String[]{"S", "M", "L", "XL"};
 
   @BeforeClass
-  public static void setupCluster() throws Exception {
+  public static void beforeXCJFQueryTest() throws Exception {
     configureCluster(NUM_NODES)
         .addConfig("xcjf", SolrTestUtil.configset("xcjf"))
         .withSolrXml(SolrTestUtil.TEST_PATH().resolve("solr.xml"))
@@ -62,6 +63,11 @@ public class XCJFQueryTest extends SolrCloudTestCase {
 
   }
 
+  @AfterClass
+  public static void afterXCJFQueryTest() throws Exception {
+    shutdownCluster();
+  }
+
 //  @After
 //  public void tearDown() throws Exception {
 //    cluster.deleteAllCollections();
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.java
index a9a3edc..be0aa1a 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientMultiCollectionTest.java
@@ -20,6 +20,7 @@ package org.apache.solr.client.solrj.impl;
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -64,6 +65,7 @@ public class ConcurrentUpdateSolrClientMultiCollectionTest extends SolrCloudTest
   }
 
   @Test
+  @LuceneTestCase.Nightly
   public void testEnsureDocumentsSentToCorrectCollection() throws Exception {
     int numTotalDocs = 1000;
     int numExpectedPerCollection = numTotalDocs / 2;