You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/05/31 20:11:03 UTC
[1/3] lucene-solr:master: SOLR-12388: Add an expected exception
message to SearchHandlerTest.testRequireZkConnectedDistrib()
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x d65f40f38 -> 61a65d592
refs/heads/master ce8735556 -> 252a8145d
SOLR-12388: Add an expected exception message to SearchHandlerTest.testRequireZkConnectedDistrib()
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/252a8145
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/252a8145
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/252a8145
Branch: refs/heads/master
Commit: 252a8145d9374978776f3fc10bfa12e14bf8433a
Parents: ce87355
Author: Steve Rowe <sa...@apache.org>
Authored: Thu May 31 16:09:11 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Thu May 31 16:09:11 2018 -0400
----------------------------------------------------------------------
.../org/apache/solr/handler/component/SearchHandlerTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/252a8145/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
index b6fc68c..c8289bd 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
@@ -241,16 +241,21 @@ public class SearchHandlerTest extends SolrTestCaseJ4
Replica connectedReplica = connectedSlice.getReplicas().iterator().next();
try (HttpSolrClient httpSolrClient = new HttpSolrClient.Builder(connectedReplica.getCoreUrl()).build()) {
ignoreException("ZooKeeper is not connected");
+ ignoreException("no servers hosting shard:");
JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);
disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();
req.process(httpSolrClient);
fail("An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");
} catch (Exception e) {
- assertTrue("Exception message is missing 'no servers hosting shard:': " + e, e.getMessage().contains("no servers hosting shard:"));
+ assertTrue("Unrecognized exception message: " + e,
+ e.getMessage().contains("no servers hosting shard:")
+ || e.getMessage().contains("ZooKeeper is not connected"));
}
}
finally {
miniCluster.shutdown();
+ unIgnoreException("no servers hosting shard:");
+ unIgnoreException("ZooKeeper is not connected");
}
}
[2/3] lucene-solr:branch_7x: SOLR-12388: print out exception when
assert fails
Posted by sa...@apache.org.
SOLR-12388: print out exception when assert fails
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/114461cb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/114461cb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/114461cb
Branch: refs/heads/branch_7x
Commit: 114461cbeb2c7a2c9f610a46d4e01ca2ee9cf171
Parents: d65f40f
Author: Steve Rowe <sa...@apache.org>
Authored: Wed May 30 00:39:26 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Thu May 31 16:10:29 2018 -0400
----------------------------------------------------------------------
.../test/org/apache/solr/handler/component/SearchHandlerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/114461cb/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
index d8eb6a4..b6fc68c 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
@@ -246,7 +246,7 @@ public class SearchHandlerTest extends SolrTestCaseJ4
req.process(httpSolrClient);
fail("An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");
} catch (Exception e) {
- assertTrue(e.getMessage().contains("no servers hosting shard:"));
+ assertTrue("Exception message is missing 'no servers hosting shard:': " + e, e.getMessage().contains("no servers hosting shard:"));
}
}
finally {
[3/3] lucene-solr:branch_7x: SOLR-12388: Add an expected exception
message to SearchHandlerTest.testRequireZkConnectedDistrib()
Posted by sa...@apache.org.
SOLR-12388: Add an expected exception message to SearchHandlerTest.testRequireZkConnectedDistrib()
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/61a65d59
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/61a65d59
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/61a65d59
Branch: refs/heads/branch_7x
Commit: 61a65d5928f4563f5c8284b1100528257e5c6834
Parents: 114461c
Author: Steve Rowe <sa...@apache.org>
Authored: Thu May 31 16:09:11 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Thu May 31 16:10:48 2018 -0400
----------------------------------------------------------------------
.../org/apache/solr/handler/component/SearchHandlerTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/61a65d59/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
index b6fc68c..c8289bd 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
@@ -241,16 +241,21 @@ public class SearchHandlerTest extends SolrTestCaseJ4
Replica connectedReplica = connectedSlice.getReplicas().iterator().next();
try (HttpSolrClient httpSolrClient = new HttpSolrClient.Builder(connectedReplica.getCoreUrl()).build()) {
ignoreException("ZooKeeper is not connected");
+ ignoreException("no servers hosting shard:");
JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);
disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();
req.process(httpSolrClient);
fail("An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");
} catch (Exception e) {
- assertTrue("Exception message is missing 'no servers hosting shard:': " + e, e.getMessage().contains("no servers hosting shard:"));
+ assertTrue("Unrecognized exception message: " + e,
+ e.getMessage().contains("no servers hosting shard:")
+ || e.getMessage().contains("ZooKeeper is not connected"));
}
}
finally {
miniCluster.shutdown();
+ unIgnoreException("no servers hosting shard:");
+ unIgnoreException("ZooKeeper is not connected");
}
}