You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2018/09/06 01:16:39 UTC
lucene-solr:branch_7x: SOLR-12733: SolrMetricReporterTest failure
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 72305b087 -> 8fd0c58e8
SOLR-12733: SolrMetricReporterTest failure
(cherry picked from commit 37375ae)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8fd0c58e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8fd0c58e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8fd0c58e
Branch: refs/heads/branch_7x
Commit: 8fd0c58e8edc61dac5d472685eab1fbbfdc9951f
Parents: 72305b0
Author: Erick <er...@apache.org>
Authored: Wed Sep 5 17:04:31 2018 -0700
Committer: Erick <er...@apache.org>
Committed: Wed Sep 5 18:12:36 2018 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/test/org/apache/solr/metrics/SolrMetricReporterTest.java | 4 ++--
solr/core/src/test/org/apache/solr/util/DateMathParserTest.java | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fd0c58e/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d5c3e53..b32a0cd 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -258,6 +258,8 @@ Bug Fixes
* SOLR-12728: RequestLoggingTest fails on occasion, not reproducible (Erick Erickson)
+* SOLR-12733: SolrMetricReporterTest failure (Erick Erickson, David Smiley)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fd0c58e/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java
index f3359cc..7d255a3 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java
@@ -20,15 +20,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.metrics.reporters.MockMetricReporter;
import org.apache.solr.schema.FieldType;
import org.junit.Test;
-public class SolrMetricReporterTest extends LuceneTestCase {
+public class SolrMetricReporterTest extends SolrTestCaseJ4 {
@Test
public void testInit() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fd0c58e/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java b/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
index 8cc417b..f5d3de2 100644
--- a/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
+++ b/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
@@ -26,14 +26,14 @@ import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import static org.apache.solr.util.DateMathParser.UTC;
/**
* Tests that the functions in DateMathParser
*/
-public class DateMathParserTest extends LuceneTestCase {
+public class DateMathParserTest extends SolrTestCaseJ4 {
/**
* A formatter for specifying every last nuance of a Date for easy