svn commit: r1621338 - /lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java

[th...@apache.org]

Author: thelabdude
Date: Fri Aug 29 16:49:22 2014
New Revision: 1621338

URL: http://svn.apache.org/r1621338
Log:
SOLR-6443: Disable test in 4x branch until the leaking cores can be resolved in trunk.

Modified:
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java?rev=1621338&r1=1621337&r2=1621338&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java Fri Aug 29 16:49:22 2014
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
 import org.apache.solr.cloud.AbstractZkTestCase;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.util.NamedList;
@@ -38,6 +39,7 @@ import org.junit.Test;
  * Depends on ZK for testing ZooKeeper backed storage logic.
  */
 @Slow
+@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-6444")
 public class TestManagedResourceStorage extends AbstractZkTestCase {
 
   /**
@@ -47,8 +49,8 @@ public class TestManagedResourceStorage 
   public void testZkBasedJsonStorage() throws Exception {
     
     // test using ZooKeeper
-    assertTrue("Not using ZooKeeper", h.getCoreContainer().isZooKeeperAware());    
-    SolrZkClient zkClient = h.getCoreContainer().getZkController().getZkClient();    
+    assertTrue("Not using ZooKeeper", h.getCoreContainer().isZooKeeperAware());
+    SolrZkClient zkClient = h.getCoreContainer().getZkController().getZkClient();
     SolrResourceLoader loader = new SolrResourceLoader("./");    
     // Solr unit tests can only write to their working directory due to
     // a custom Java Security Manager installed in the test environment
@@ -58,7 +60,7 @@ public class TestManagedResourceStorage 
       zkStorageIO.configure(loader, initArgs);
       doStorageTests(loader, zkStorageIO);
     } finally {
-      zkClient.close();
+      loader.close();
     }
   }
 
@@ -70,12 +72,16 @@ public class TestManagedResourceStorage 
   public void testFileBasedJsonStorage() throws Exception {
     File instanceDir = createTempDir("json-storage");
     SolrResourceLoader loader = new SolrResourceLoader(instanceDir.getAbsolutePath());
-    NamedList<String> initArgs = new NamedList<>();
-    String managedDir = instanceDir.getAbsolutePath() + File.separator + "managed";
-    initArgs.add(ManagedResourceStorage.STORAGE_DIR_INIT_ARG, managedDir);
-    FileStorageIO fileStorageIO = new FileStorageIO();
-    fileStorageIO.configure(loader, initArgs);
-    doStorageTests(loader, fileStorageIO);
+    try {
+      NamedList<String> initArgs = new NamedList<>();
+      String managedDir = instanceDir.getAbsolutePath() + File.separator + "managed";
+      initArgs.add(ManagedResourceStorage.STORAGE_DIR_INIT_ARG, managedDir);
+      FileStorageIO fileStorageIO = new FileStorageIO();
+      fileStorageIO.configure(loader, initArgs);
+      doStorageTests(loader, fileStorageIO);
+    } finally {
+      loader.close();
+    }
   }
 
   /**