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

SOLR-13453: Adjust auth metrics asserts in tests after SOLR-13449 (#668)

This commit is contained in:
Jan Høydahl 2019-05-09 20:13:46 +02:00 committed by GitHub
parent 3857388136
commit 5b772f7c9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -81,6 +81,11 @@ New Features
* SOLR-13049: Make contrib/ltr Feature.defaultValue configurable. (Stanislav Livotov, Christine Poerschke) * SOLR-13049: Make contrib/ltr Feature.defaultValue configurable. (Stanislav Livotov, Christine Poerschke)
Other Changes
----------------------
* SOLR-13453: Adjust auth metrics asserts in tests caused by SOLR-13449 (janhoy)
================== 8.1.0 ================== ================== 8.1.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

8
solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java
View File

@ -34,7 +34,6 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ByteArrayEntity; import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.cloud.SolrCloudAuthTestCase; import org.apache.solr.cloud.SolrCloudAuthTestCase;
@ -61,7 +60,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
* </p> * </p>
*/ */
@SolrTestCaseJ4.SuppressSSL @SolrTestCaseJ4.SuppressSSL
@LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-13453")
public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase { public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase {
protected static final int NUM_SERVERS = 2; protected static final int NUM_SERVERS = 2;
protected static final int NUM_SHARDS = 2; protected static final int NUM_SHARDS = 2;
@ -172,11 +170,11 @@ public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase {
// Now update three documents // Now update three documents
assertAuthMetricsMinimums(1, 1, 0, 0, 0, 0); assertAuthMetricsMinimums(1, 1, 0, 0, 0, 0);
assertPkiAuthMetricsMinimums(12, 12, 0, 0, 0, 0); assertPkiAuthMetricsMinimums(4, 4, 0, 0, 0, 0);
Pair<String,Integer> result = post(baseUrl + "/" + COLLECTION + "/update?commit=true", "[{\"id\" : \"1\"}, {\"id\": \"2\"}, {\"id\": \"3\"}]", jwtTestToken); Pair<String,Integer> result = post(baseUrl + "/" + COLLECTION + "/update?commit=true", "[{\"id\" : \"1\"}, {\"id\": \"2\"}, {\"id\": \"3\"}]", jwtTestToken);
assertEquals(Integer.valueOf(200), result.second()); assertEquals(Integer.valueOf(200), result.second());
assertAuthMetricsMinimums(3, 3, 0, 0, 0, 0); assertAuthMetricsMinimums(3, 3, 0, 0, 0, 0);
assertPkiAuthMetricsMinimums(13, 13, 0, 0, 0, 0); assertPkiAuthMetricsMinimums(5, 5, 0, 0, 0, 0);
// First a non distributed query // First a non distributed query
result = get(baseUrl + "/" + COLLECTION + "/query?q=*:*&distrib=false", jwtTestToken); result = get(baseUrl + "/" + COLLECTION + "/query?q=*:*&distrib=false", jwtTestToken);
@ -191,7 +189,7 @@ public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase {
// Delete // Delete
assertEquals(200, get(baseUrl + "/admin/collections?action=DELETE&name=" + COLLECTION, jwtTestToken).second().intValue()); assertEquals(200, get(baseUrl + "/admin/collections?action=DELETE&name=" + COLLECTION, jwtTestToken).second().intValue());
assertAuthMetricsMinimums(10, 10, 0, 0, 0, 0); assertAuthMetricsMinimums(10, 10, 0, 0, 0, 0);
assertPkiAuthMetricsMinimums(15, 15, 0, 0, 0, 0); assertPkiAuthMetricsMinimums(7, 7, 0, 0, 0, 0);
} }
private void getAndFail(String url, String token) { private void getAndFail(String url, String token) {

4
solr/core/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithHadoopAuthPlugin.java
View File

@ -21,7 +21,6 @@ import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.Constants; import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@ -34,7 +33,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-13453")
public class TestSolrCloudWithHadoopAuthPlugin extends SolrCloudAuthTestCase { public class TestSolrCloudWithHadoopAuthPlugin extends SolrCloudAuthTestCase {
protected static final int NUM_SERVERS = 1; protected static final int NUM_SERVERS = 1;
protected static final int NUM_SHARDS = 1; protected static final int NUM_SHARDS = 1;
@ -138,6 +136,6 @@ public class TestSolrCloudWithHadoopAuthPlugin extends SolrCloudAuthTestCase {
deleteReq.process(solrClient); deleteReq.process(solrClient);
AbstractDistribZkTestBase.waitForCollectionToDisappear(collectionName, AbstractDistribZkTestBase.waitForCollectionToDisappear(collectionName,
solrClient.getZkStateReader(), true, true, 330); solrClient.getZkStateReader(), true, true, 330);
assertAuthMetricsMinimums(16, 8, 0, 8, 0, 0); assertAuthMetricsMinimums(14, 8, 0, 6, 0, 0);
} }
} }