From 196f4530a29a95060bdd0ed464eebc177c5558f2 Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Tue, 24 May 2016 08:35:16 +0100 Subject: [PATCH] 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. --- .../test/org/apache/solr/client/solrj/ConnectionReuseTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 15369b8df5e..a397f5513c1 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(),