You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2016/12/31 19:47:25 UTC
lucene-solr:master: SOLR-9880 Fix concurrency bugs in tests.
Repository: lucene-solr
Updated Branches:
refs/heads/master 832d02bf4 -> fb2800b14
SOLR-9880 Fix concurrency bugs in tests.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fb2800b1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fb2800b1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fb2800b1
Branch: refs/heads/master
Commit: fb2800b1497a67493c7f8944bda22f590bb9cc6b
Parents: 832d02b
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Sat Dec 31 20:46:32 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Sat Dec 31 20:46:32 2016 +0100
----------------------------------------------------------------------
.../apache/solr/metrics/reporters/SolrGangliaReporterTest.java | 3 ++-
.../apache/solr/metrics/reporters/SolrGraphiteReporterTest.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb2800b1/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java
index b5b0f85..d9675ef 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java
@@ -73,7 +73,8 @@ public class SolrGangliaReporterTest extends SolrTestCaseJ4 {
gangliaReporter.start();
Thread.sleep(5000);
assertTrue(names.size() >= 3);
- for (String name : names) {
+ String[] frozenNames = (String[])names.toArray(new String[names.size()]);
+ for (String name : frozenNames) {
assertTrue(name, name.startsWith("test.solr.node.cores."));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb2800b1/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
index 6773e0c..3d1c482 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
@@ -69,7 +69,8 @@ public class SolrGraphiteReporterTest extends SolrTestCaseJ4 {
assertTrue(reporter instanceof SolrGraphiteReporter);
Thread.sleep(5000);
assertTrue(mock.lines.size() >= 3);
- for (String line : mock.lines) {
+ String[] frozenLines = (String[])mock.lines.toArray(new String[mock.lines.size()]);
+ for (String line : frozenLines) {
assertTrue(line, line.startsWith("test.solr.node.cores."));
}
} finally {