You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/17 18:47:45 UTC

[lucene-solr] 14/18: @1014 Enable tests.

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

commit d77f6b6e33ff831921e9958837d81aaec82fb7f7
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Oct 17 11:00:15 2020 -0500

    @1014 Enable tests.
---
 .../apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java   | 1 -
 .../test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java | 1 -
 .../org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java | 2 --
 .../src/test/org/apache/solr/search/facet/TestJsonFacets.java    | 1 -
 .../core/src/test/org/apache/solr/search/join/BJQParserTest.java | 9 ++++-----
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java
index 43f9153..b603e98 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java
@@ -263,7 +263,6 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {
    * easier to trace/debug then a pure random monstrosity.
    * (ie: if something obvious gets broken, this test may fail faster and in a more obvious way then testRandom)
    */
-  @Ignore // nocommit flakey
   public void testBespoke() throws Exception {
 
     { // sanity check our test methods can handle a query matching no docs
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
index cafa57f..2945955 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
@@ -264,7 +264,6 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
    * easier to trace/debug then a pure random monstrosity.
    * (ie: if something obvious gets broken, this test may fail faster and in a more obvious way then testRandom)
    */
-  @Ignore // nocommit - this is flakey, sometimes it's off a bit
   public void testBespoke() throws Exception {
     { // trivial single level facet
       Map<String,TermFacet> facets = new LinkedHashMap<>();
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
index 61491c9..06877a3 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java
@@ -80,7 +80,6 @@ import org.slf4j.LoggerFactory;
  * 
  * @see TestCloudJSONFacetSKG
  */
-@Ignore // nocommit
 public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -374,7 +373,6 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {
     }
   }
 
-  @Ignore // nocommit - needs debugging - a slow thing of some kind or leak?
   public void testBespokeAllBuckets() throws Exception {
     { // single level facet w/sorting on skg and allBuckets
       Map<String,TermFacet> facets = new LinkedHashMap<>();
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
index 86c6485..2b8d675 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
@@ -52,7 +52,6 @@ import org.junit.Test;
 //   TestJsonRangeFacets for range facet tests
 
 @LuceneTestCase.SuppressCodecs({"Lucene3x","Lucene40","Lucene41","Lucene42","Lucene45","Appending"})
-@Ignore // nocommit - need to look into - the test itself is fast and the surrounding can be 30-40 seconds - whats up doc
 public class TestJsonFacets extends SolrTestCaseHS {
   
   private static SolrInstances servers;  // for distributed testing
diff --git a/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java b/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java
index b0456bd..c24dec5 100644
--- a/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java
+++ b/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java
@@ -289,13 +289,12 @@ public class BJQParserTest extends SolrTestCaseJ4 {
   }
 
   @Test
-  @Ignore // nocommit we probably have to add a wait for this to be populated
   public void testCacheHit() throws IOException {
 
-    MetricsMap parentFilterCache = (MetricsMap)((SolrMetricManager.GaugeWrapper<?>)h.getCore().getCoreMetricManager().getRegistry()
-        .getMetrics().get("CACHE.searcher.perSegFilter")).getGauge();
-    MetricsMap filterCache = (MetricsMap)((SolrMetricManager.GaugeWrapper<?>)h.getCore().getCoreMetricManager().getRegistry()
-        .getMetrics().get("CACHE.searcher.filterCache")).getGauge();
+    MetricsMap parentFilterCache = (MetricsMap)(h.getCore().getCoreMetricManager().getRegistry()
+        .getMetrics().get("CACHE.searcher.perSegFilter"));
+    MetricsMap filterCache = (MetricsMap)(h.getCore().getCoreMetricManager().getRegistry()
+        .getMetrics().get("CACHE.searcher.filterCache"));
 
     Map<String,Object> parentsBefore = parentFilterCache.getValue();