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 2017/07/18 15:41:59 UTC
lucene-solr:branch_7x: SOLR-11106:
TestLBHttpSolrClient.testReliablity takes 30 seconds because of the wrong
server name
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x a848b843e -> b50a6edf4
SOLR-11106: TestLBHttpSolrClient.testReliablity takes 30 seconds because of the wrong server name
(cherry picked from commit dd5be42)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b50a6edf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b50a6edf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b50a6edf
Branch: refs/heads/branch_7x
Commit: b50a6edf42ebd4ed75cc8803d722676ca1d2386b
Parents: a848b84
Author: Erick Erickson <er...@apache.org>
Authored: Tue Jul 18 08:31:35 2017 -0700
Committer: Erick Erickson <er...@apache.org>
Committed: Tue Jul 18 08:32:08 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b50a6edf/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3a85428..8aacda4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -77,6 +77,9 @@ Other Changes
* SOLR-11052: Remove unnecessary Long-to-Integer and back casts in ReplicationHandler.
(Ramsey Haddad via Christine Poerschke)
+* SOLR-11106: TestLBHttpSolrClient.testReliablity takes 30 seconds because of the wrong server name
+ (Kensho Hirasawa via Erick Erickson)
+
================== 7.0.0 ==================
Versions of Major Components
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b50a6edf/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
index 4aa5951..b3a6518 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -220,7 +220,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
// Start the killed server once again
solr[1].startJetty();
// Wait for the alive check to complete
- waitForServer(30, client, 3, "solr1");
+ waitForServer(30, client, 3, solr[1].name);
} finally {
HttpClientUtil.close(myHttpClient);
}