You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2018/10/18 22:17:08 UTC
[1/4] lucene-solr:branch_7x: SOLR-12876: upon failure report
exception message in ShardParamsTest.testGetShardsTolerantAsBool
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 2a04115a7 -> 4d811b798
SOLR-12876: upon failure report exception message in ShardParamsTest.testGetShardsTolerantAsBool
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1643df49
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1643df49
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1643df49
Branch: refs/heads/branch_7x
Commit: 1643df49d081ea5ed328463acb3238bda2d42878
Parents: 2a04115
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Oct 16 10:52:11 2018 -0400
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Oct 18 17:59:14 2018 -0400
----------------------------------------------------------------------
.../src/test/org/apache/solr/common/params/ShardParamsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1643df49/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java b/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
index 5694972..b17f217 100644
--- a/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
@@ -77,6 +77,6 @@ public class ShardParamsTest extends LuceneTestCase
// values that aren't "requireZkConnected" or boolean should throw an exception
params.set(ShardParams.SHARDS_TOLERANT, "bogusValue");
Exception exception = expectThrows(SolrException.class, () -> ShardParams.getShardsTolerantAsBool(params));
- assertTrue(exception.getMessage().startsWith("invalid boolean value: "));
+ assertTrue(exception.getMessage(), exception.getMessage().startsWith("invalid boolean value: "));
}
}
[4/4] lucene-solr:branch_7x: SOLR-12877: avoid NPE in
TestUtilizeNode.getReplicaList
Posted by cp...@apache.org.
SOLR-12877: avoid NPE in TestUtilizeNode.getReplicaList
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4d811b79
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4d811b79
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4d811b79
Branch: refs/heads/branch_7x
Commit: 4d811b798976e3213737ffdccd4540e40218d837
Parents: ac60ddd
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Oct 16 12:54:00 2018 -0400
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Oct 18 17:59:44 2018 -0400
----------------------------------------------------------------------
.../src/test/org/apache/solr/cloud/TestUtilizeNode.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4d811b79/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java b/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
index bc64b6d..18ac662 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
@@ -170,11 +170,13 @@ public class TestUtilizeNode extends SolrCloudTestCase {
.getClusterState().getCollectionOrNull(collectionName, false);
List<Replica> results = new ArrayList<>(3);
- collection.forEachReplica((s, replica) -> {
+ if (collection != null) {
+ collection.forEachReplica((s, replica) -> {
if (replica.getNodeName().equals(jettyNode.getNodeName())) {
- results.add(replica);
- }
- });
+ results.add(replica);
+ }
+ });
+ }
return results;
}
[3/4] lucene-solr:branch_7x: SOLR-12877: avoid NPE in
TestTlogReplica.testRealTimeGet
Posted by cp...@apache.org.
SOLR-12877: avoid NPE in TestTlogReplica.testRealTimeGet
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ac60ddda
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ac60ddda
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ac60ddda
Branch: refs/heads/branch_7x
Commit: ac60ddda3c96584ebcca35660d846ab6424ea680
Parents: 3e874f7
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Oct 16 12:52:51 2018 -0400
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Oct 18 17:59:43 2018 -0400
----------------------------------------------------------------------
solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac60ddda/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
index 6888d88..8e66b1e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
@@ -342,6 +342,7 @@ public class TestTlogReplica extends SolrCloudTestCase {
client.add(new SolrInputDocument("id", String.valueOf(id), "foo_s", "bar"));
}
SolrDocument docCloudClient = cluster.getSolrClient().getById(collectionName, String.valueOf(id));
+ assertNotNull(docCloudClient);
assertEquals("bar", docCloudClient.getFieldValue("foo_s"));
for (Replica rGet:slice.getReplicas()) {
try (HttpSolrClient client = getHttpSolrClient(rGet.getCoreUrl(), httpClient)) {
[2/4] lucene-solr:branch_7x: SOLR-12876: remove @BadApple from
ShardParamsTest.testGetShardsTolerantAsBool
Posted by cp...@apache.org.
SOLR-12876: remove @BadApple from ShardParamsTest.testGetShardsTolerantAsBool
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3e874f7d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3e874f7d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3e874f7d
Branch: refs/heads/branch_7x
Commit: 3e874f7dcea462f85adc66a208aa19e6b874562f
Parents: 1643df4
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Oct 16 10:52:51 2018 -0400
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Oct 18 17:59:15 2018 -0400
----------------------------------------------------------------------
.../src/test/org/apache/solr/common/params/ShardParamsTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3e874f7d/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java b/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
index b17f217..b300a0f 100644
--- a/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
@@ -52,7 +52,6 @@ public class ShardParamsTest extends LuceneTestCase
public void testDistribSinglePass() { assertEquals(ShardParams.DISTRIB_SINGLE_PASS, "distrib.singlePass"); }
@Test
- @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 20-Sep-2018
public void testGetShardsTolerantAsBool() {
ModifiableSolrParams params = new ModifiableSolrParams();
// shards.tolerant param is not set; default should be false