You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/05/24 07:39:26 UTC
lucene-solr:master: Revert "SOLR-9132: Fix request-counting logic in
ConnectionReuseTest"
Repository: lucene-solr
Updated Branches:
refs/heads/master ba46eb7be -> 196f4530a
Revert "SOLR-9132: Fix request-counting logic in ConnectionReuseTest"
The logic for request-counting is different in master and 6.x, due to the
difference in HttpClient implementations.
This reverts commit a35057fff278e25ad65a90d88ae85b8eec635b8b.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/196f4530
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/196f4530
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/196f4530
Branch: refs/heads/master
Commit: 196f4530a29a95060bdd0ed464eebc177c5558f2
Parents: ba46eb7
Author: Alan Woodward <al...@romseysoftware.co.uk>
Authored: Tue May 24 08:35:16 2016 +0100
Committer: Alan Woodward <al...@romseysoftware.co.uk>
Committed: Tue May 24 08:35:16 2016 +0100
----------------------------------------------------------------------
.../src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/196f4530/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java b/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java
index 15369b8..a397f55 100644
--- a/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java
+++ b/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java
@@ -149,7 +149,7 @@ public class ConnectionReuseTest extends SolrCloudTestCase {
// we try and make sure the connection we get has handled all of the requests in this test
if (client instanceof ConcurrentUpdateSolrClient) {
// we can't fully control queue polling breaking up requests - allow a bit of leeway
- int exp = queueBreaks + 3;
+ int exp = cnt1 + queueBreaks + 2;
assertTrue(
"We expected all communication via streaming client to use one connection! expected=" + exp + " got="
+ metrics.getRequestCount(),