You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/09/03 18:43:32 UTC
svn commit: r1701069 - in /lucene/dev/branches/lucene_solr_5_3: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/cloud/
solr/core/src/test/org/apache/solr/security/
Author: noble
Date: Thu Sep 3 16:43:32 2015
New Revision: 1701069
URL: http://svn.apache.org/r1701069
Log:
SOLR-8006: Test failures in BasicAuthIntegrationTest
Added:
lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterBase.java
- copied unchanged from r1701066, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterBase.java
Modified:
lucene/dev/branches/lucene_solr_5_3/ (props changed)
lucene/dev/branches/lucene_solr_5_3/solr/ (props changed)
lucene/dev/branches/lucene_solr_5_3/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
Modified: lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java?rev=1701069&r1=1701068&r2=1701069&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java Thu Sep 3 16:43:32 2015
@@ -205,7 +205,6 @@ public class TestMiniSolrCloudCluster ex
assertTrue(e.code() >= 500 && e.code() < 600);
}
- doExtraTests(miniCluster, zkClient, zkStateReader,cloudSolrClient, collectionName);
// delete the collection we created earlier
miniCluster.deleteCollection(collectionName);
AbstractDistribZkTestBase.waitForCollectionToDisappear(collectionName, zkStateReader, true, true, 330);
@@ -216,9 +215,6 @@ public class TestMiniSolrCloudCluster ex
}
}
- protected void doExtraTests(MiniSolrCloudCluster miniCluster, SolrZkClient zkClient, ZkStateReader zkStateReader, CloudSolrClient cloudSolrClient,
- String defaultCollName) throws Exception { /*do nothing*/ }
-
@Test
public void testErrorsInStartup() throws Exception {
Modified: lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java?rev=1701069&r1=1701068&r2=1701069&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java Thu Sep 3 16:43:32 2015
@@ -40,7 +40,7 @@ import org.apache.solr.client.solrj.impl
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.GenericSolrRequest;
import org.apache.solr.cloud.MiniSolrCloudCluster;
-import org.apache.solr.cloud.TestMiniSolrCloudCluster;
+import org.apache.solr.cloud.TestMiniSolrCloudClusterBase;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
@@ -62,7 +62,7 @@ import static java.util.Collections.sing
import static org.apache.solr.common.cloud.ZkStateReader.BASE_URL_PROP;
-public class BasicAuthIntegrationTest extends TestMiniSolrCloudCluster {
+public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase {
private static final Logger log = LoggerFactory.getLogger(BasicAuthIntegrationTest.class);
@@ -164,11 +164,18 @@ public class BasicAuthIntegrationTest ex
}
- httpPost = new HttpPost(baseUrl + "/admin/authorization");
+ /* httpPost = new HttpPost(baseUrl + "/admin/authorization");
setBasicAuthHeader(httpPost, "harry", "HarryIsUberCool");
httpPost.setEntity(new ByteArrayEntity(Utils.toJSON(singletonMap("delete-permission", "collection-admin-edit"))));
- r = cl.execute(httpPost);//cleanup so that the super class does not need to pass on credentials
+ r = cl.execute(httpPost); //cleanup so that the super class does not need to pass on credentials
+ for (Slice slice : zkStateReader.getClusterState().getCollection(defaultCollName).getSlices()) {
+ //ensure that all nodes have removed the collection-admin-edit permission
+ for (Replica replica : slice.getReplicas()) {
+ baseUrl = replica.getStr(BASE_URL_PROP);
+ verifySecurityStatus(cl, baseUrl + "/admin/authorization", "authorization/permissions[2]/name", null, 20);
+ }
+ }*/
}
public static void verifySecurityStatus(HttpClient cl, String url, String objPath, Object expected, int count) throws Exception {
@@ -187,7 +194,7 @@ public class BasicAuthIntegrationTest ex
success = true;
break;
}
- } else if (Objects.equals(String.valueOf(actual), expected)) {
+ } else if (Objects.equals(actual == null ? null : String.valueOf(actual), expected)) {
success = true;
break;
}
@@ -223,21 +230,6 @@ public class BasicAuthIntegrationTest ex
}
};
-
- @Override
- public void testErrorsInStartup() throws Exception {
- //don't do anything
- }
-
- @Override
- public void testErrorsInShutdown() throws Exception {
- }
-
-
- @Override
- public void testCollectionCreateWithoutCoresThenDelete() throws Exception {
- }
-
//the password is 'SolrRocks'
//this could be generated everytime. But , then we will not know if there is any regression
private static final String STD_CONF = "{\n" +