[lucene-solr] branch branch_8x updated: Harden SolrJmxReporterCloudTest

[ho...@apache.org]

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

hossman pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 650801b  Harden SolrJmxReporterCloudTest
650801b is described below

commit 650801b5db87cbbc4f00e8a4068007c976127773
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Fri Aug 9 15:27:28 2019 -0700

    Harden SolrJmxReporterCloudTest
    
    null out local ref to PlatformMBeanServer so test runner doesn't count it's memory size against the test class
    
    (cherry picked from commit 6cbe39c786c50b269ce383f44ecbee019e820a92)
---
 .../apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java
index b94ff8a..3da4b14 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java
@@ -35,6 +35,7 @@ import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.metrics.SolrMetricManager;
 import org.apache.solr.metrics.SolrMetricReporter;
 import org.apache.solr.metrics.reporters.jmx.JmxMetricsReporter;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -60,9 +61,13 @@ public class SolrJmxReporterCloudTest extends SolrCloudTestCase {
         .setMaxShardsPerNode(2)
         .process(cluster.getSolrClient());
   }
+  @AfterClass
+  public static void releaseMBeanServer() {
+    mBeanServer = null;
+  }
+  
 
   @Test
-  //Commented 14-Oct-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018
   public void testJmxReporter() throws Exception {
     CollectionAdminRequest.reloadCollection(COLLECTION).processAndWait(cluster.getSolrClient(), 60);
     CloudSolrClient solrClient = cluster.getSolrClient();