[lucene-solr] branch reference_impl_dev updated: Re-enable SolrZkClientTest

[th...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

thelabdude 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 215e605  Re-enable SolrZkClientTest
215e605 is described below

commit 215e605ce08fd451935d3740259f9624b75aefb4
Author: Timothy Potter <th...@gmail.com>
AuthorDate: Fri Aug 21 16:20:38 2020 -0600

    Re-enable SolrZkClientTest
---
 .../src/test/org/apache/solr/common/cloud/SolrZkClientTest.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java b/solr/solrj/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java
index 786a358..2ffd741 100644
--- a/solr/solrj/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java
@@ -40,12 +40,10 @@ import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Id;
 import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Ignore // nocommit debug
 public class SolrZkClientTest extends SolrCloudTestCase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
@@ -82,7 +80,7 @@ public class SolrZkClientTest extends SolrCloudTestCase {
     }
 
     defaultClient = new SolrZkClient(zkServer.getZkAddress(), AbstractZkTestCase.TIMEOUT).start();
-    defaultClient.mkdir(PATH);
+    defaultClient.mkdirs(PATH);
 
     aclClient = new SolrZkClient(zkServer.getZkAddress(), AbstractZkTestCase.TIMEOUT) {
       @Override
@@ -121,7 +119,7 @@ public class SolrZkClientTest extends SolrCloudTestCase {
     defaultClient.close();
     zkServer.shutdown();
     solrClient.close();
-    cluster.shutdown();
+    shutdownCluster();
     super.tearDown();
   }