[lucene-solr] branch reference_impl_dev updated: @793 Bring back 3 test classes.

[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 1bce09d  @793 Bring back 3 test classes.
1bce09d is described below

commit 1bce09d1d99cd7e96d54c7ce71de2c3ff7d306dc
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Sep 7 20:18:44 2020 -0500

    @793 Bring back 3 test classes.
---
 solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java  | 5 ++---
 solr/core/src/test/org/apache/solr/handler/TestConfigReload.java | 5 ++---
 solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java  | 3 ++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java b/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
index 9a91982..06aa48d 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
@@ -58,14 +58,13 @@ import org.slf4j.LoggerFactory;
 import static java.util.Arrays.asList;
 import static org.apache.solr.common.util.Utils.fromJSONString;
 
-@Ignore // nocommit debug
 public class TestBlobHandler extends AbstractFullDistribZkTestBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Test
   public void doBlobHandlerTest() throws Exception {
 
-    try (SolrClient client = createNewSolrClient("", getBaseUrl((HttpSolrClient) clients.get(0)))) {
+    try (SolrClient client = createNewSolrClient("", getBaseUrl((Http2SolrClient) clients.get(0)))) {
       CollectionAdminResponse response1;
       CollectionAdminRequest.Create createCollectionRequest = CollectionAdminRequest.createCollection(".system",1,2);
       response1 = createCollectionRequest.process(client);
@@ -169,7 +168,7 @@ public class TestBlobHandler extends AbstractFullDistribZkTestBase {
         assertEquals(b.get(i), bytarr[i]);
       }
     } finally {
-      httpGet.releaseConnection();
+     HttpClientUtil.close(httpClient);
     }
 
   }
diff --git a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
index 23a41c7..5b7db83 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
@@ -52,7 +52,6 @@ import org.slf4j.LoggerFactory;
 
 import static java.util.Arrays.asList;
 
-@Ignore // nocommit investigate - i think this needs to be managed schema and is not?
 public class TestConfigReload extends SolrCloudBridgeTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -72,7 +71,7 @@ public class TestConfigReload extends SolrCloudBridgeTestCase {
     if (log.isInfoEnabled()) {
       log.info("live_nodes_count :  {}", cloudClient.getZkStateReader().getClusterState().getLiveNodes());
     }
-    String confPath = ZkConfigManager.CONFIGS_ZKNODE+"/conf1/";
+    String confPath = ZkConfigManager.CONFIGS_ZKNODE+"/_default/";
 //    checkConfReload(client, confPath + ConfigOverlay.RESOURCE_NAME, "overlay");
     checkConfReload(client, confPath + SolrConfig.DEFAULT_CONF_FILE,"config", "/config");
 
@@ -90,7 +89,7 @@ public class TestConfigReload extends SolrCloudBridgeTestCase {
     }
     long startTime = System.nanoTime();
     Stat newStat = client.setData(resPath, data, true);
-    client.setData("/configs/conf1", new byte[]{1}, true);
+    client.setData("/configs/_default", new byte[]{1}, true);
     assertTrue(newStat.getVersion() > stat.getVersion());
     if (log.isInfoEnabled()) {
       log.info("new_version {}", newStat.getVersion());
diff --git a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
index 2a27911..d3ab265 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
@@ -47,7 +47,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 @SolrTestCaseJ4.SuppressSSL     // Currently unknown why SSL does not work with this test
-@Ignore // nocommit hangs now
 public class TestRestoreCore extends SolrJettyTestBase {
 
   JettySolrRunner masterJetty;
@@ -104,9 +103,11 @@ public class TestRestoreCore extends SolrJettyTestBase {
   public void tearDown() throws Exception {
     super.tearDown();
     if (null != masterClient) {
+      masterClient.close();
       masterClient  = null;
     }
     if (null != masterJetty) {
+      masterJetty.close();
       masterJetty = null;
     }
     master = null;