Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12514: Properly close a SolrClient to fix the test teardown.

This commit is contained in:
Andrzej Bialecki 2019-01-03 14:59:31 +01:00
parent dbcb245062
commit 0a7a478c1f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
View File

@ -44,6 +44,7 @@ import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.message.AbstractHttpMessage; import org.apache.http.message.AbstractHttpMessage;
import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicHeader;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@ -242,13 +243,15 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {
//Test for SOLR-12514. Create a new jetty . This jetty does not have the collection. //Test for SOLR-12514. Create a new jetty . This jetty does not have the collection.
//Make a request to that jetty and it should fail //Make a request to that jetty and it should fail
JettySolrRunner aNewJetty = cluster.startJettySolrRunner(); JettySolrRunner aNewJetty = cluster.startJettySolrRunner();
SolrClient aNewClient = aNewJetty.newClient();
try { try {
del = new UpdateRequest().deleteByQuery("*:*"); del = new UpdateRequest().deleteByQuery("*:*");
del.process(aNewJetty.newClient(), COLLECTION); del.process(aNewClient, COLLECTION);
fail("This should not have succeeded without credentials"); fail("This should not have succeeded without credentials");
} catch (HttpSolrClient.RemoteSolrException e) { } catch (HttpSolrClient.RemoteSolrException e) {
assertTrue(e.getMessage().contains("Unauthorized request")); assertTrue(e.getMessage().contains("Unauthorized request"));
} finally { } finally {
aNewClient.close();
cluster.stopJettySolrRunner(aNewJetty); cluster.stopJettySolrRunner(aNewJetty);
} }