You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2020/08/07 23:04:14 UTC

[lucene-solr] branch master updated: SOLR-14582: Fix TestConfig

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

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


The following commit(s) were added to refs/heads/master by this push:
     new bd1dd6b  SOLR-14582: Fix TestConfig
bd1dd6b is described below

commit bd1dd6bdfb5b64bc4c332dc5d11aa4a9e300e0b8
Author: Tomas Fernandez Lobbe <tf...@apache.org>
AuthorDate: Fri Aug 7 16:01:11 2020 -0700

    SOLR-14582: Fix TestConfig
---
 solr/core/src/test/org/apache/solr/core/TestConfig.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java
index 5544e2e..a1404e1 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java
@@ -163,7 +163,6 @@ public class TestConfig extends SolrTestCaseJ4 {
 
   // If defaults change, add test methods to cover each version
   @Test
-  @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-14582")
   public void testDefaults() throws Exception {
 
     int numDefaultsTested = 0;
@@ -185,6 +184,8 @@ public class TestConfig extends SolrTestCaseJ4 {
 
     ++numDefaultsTested; assertNotNull("default metrics", sic.metricsInfo);
 
+    ++numDefaultsTested; assertEquals("default maxCommitMergeWaitTime", -1, sic.maxCommitMergeWaitMillis);
+
     ++numDefaultsTested; ++numNullDefaults;
     assertNull("default mergePolicyFactoryInfo", sic.mergePolicyFactoryInfo);