You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2018/12/12 23:14:47 UTC
lucene-solr:master: SOLR-12791,
SOLR-13067: Fix test failure for BasicAuthIntegrationTest Make
PkiAuthenticationIntegrationTest beast-able
Repository: lucene-solr
Updated Branches:
refs/heads/master 1e6872683 -> 9728dbc16
SOLR-12791, SOLR-13067: Fix test failure for BasicAuthIntegrationTest
Make PkiAuthenticationIntegrationTest beast-able
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9728dbc1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9728dbc1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9728dbc1
Branch: refs/heads/master
Commit: 9728dbc1675bb7fd4ca84071d40ae3c0528e424c
Parents: 1e68726
Author: Jan Høydahl <ja...@apache.org>
Authored: Thu Dec 13 00:14:37 2018 +0100
Committer: Jan Høydahl <ja...@apache.org>
Committed: Thu Dec 13 00:14:37 2018 +0100
----------------------------------------------------------------------
.../apache/solr/security/BasicAuthIntegrationTest.java | 4 ++--
.../solr/security/PKIAuthenticationIntegrationTest.java | 12 +++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9728dbc1/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
index db47d37..f704cdf 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
@@ -254,7 +254,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {
});
assertEquals(401, exp.code());
assertAuthMetricsMinimums(20, 8, 9, 1, 2, 0);
- assertPkiAuthMetricsMinimums(4, 4, 0, 0, 0, 0);
+ assertPkiAuthMetricsMinimums(3, 3, 0, 0, 0, 0);
// Query that succeeds
GenericSolrRequest req = new GenericSolrRequest(SolrRequest.METHOD.GET, "/select", params);
@@ -262,7 +262,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {
cluster.getSolrClient().request(req, COLLECTION);
assertAuthMetricsMinimums(21, 9, 9, 1, 2, 0);
- assertPkiAuthMetricsMinimums(7, 7, 0, 0, 0, 0);
+ assertPkiAuthMetricsMinimums(6, 6, 0, 0, 0, 0);
executeCommand(baseUrl + authcPrefix, cl, "{set-property : { blockUnknown: false}}", "harry", "HarryIsUberCool");
} finally {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9728dbc1/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java
index aa70d05..eb25b83 100644
--- a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java
@@ -42,19 +42,21 @@ import static org.apache.solr.security.TestAuthorizationFramework.verifySecurity
public class PKIAuthenticationIntegrationTest extends SolrCloudAuthTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
+ private static final String COLLECTION = "pkiCollection";
+
@BeforeClass
public static void setupCluster() throws Exception {
configureCluster(2)
.addConfig("conf", configset("cloud-minimal"))
.configure();
+
+ CollectionAdminRequest.createCollection(COLLECTION, "conf", 2, 1).process(cluster.getSolrClient());
+
+ cluster.waitForActiveCollection(COLLECTION, 2, 2);
}
@Test
public void testPkiAuth() throws Exception {
-
- CollectionAdminRequest.createCollection("collection", "conf", 2, 1).process(cluster.getSolrClient());
-
// TODO make a SolrJ helper class for this
byte[] bytes = Utils.toJSON(makeMap("authorization", singletonMap("class", MockAuthorizationPlugin.class.getName()),
"authentication", singletonMap("class", MockAuthenticationPlugin.class.getName())));
@@ -94,7 +96,7 @@ public class PKIAuthenticationIntegrationTest extends SolrCloudAuthTestCase {
return true;
};
QueryRequest query = new QueryRequest(params);
- query.process(cluster.getSolrClient(), "collection");
+ query.process(cluster.getSolrClient(), COLLECTION);
assertTrue("all nodes must get the user solr , no:of nodes got solr : " + count.get(), count.get() > 2);
assertPkiAuthMetricsMinimums(2, 2, 0, 0, 0, 0);
}