You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/19 22:21:06 UTC
[lucene-solr] 02/03: @1028 Enable tests.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit d2f4e8151174d8374bf961c3ff3b0656bb830e91
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Oct 19 16:56:10 2020 -0500
@1028 Enable tests.
---
.../CreateCollectionsIndexAndRestartTest.java | 4 +++-
.../PreAnalyzedFieldManagedSchemaCloudTest.java | 2 --
.../apache/solr/schema/TestCloudManagedSchema.java | 21 +++++++++++++--------
.../org/apache/solr/search/FuzzySearchTest.java | 1 -
.../org/apache/solr/search/TestRealTimeGet.java | 1 -
.../test/org/apache/solr/util/TestExportTool.java | 1 -
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CreateCollectionsIndexAndRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CreateCollectionsIndexAndRestartTest.java
index c188f04..ce0d447 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CreateCollectionsIndexAndRestartTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CreateCollectionsIndexAndRestartTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.cloud.api.collections;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -45,12 +46,13 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Slow
-@Ignore
+@LuceneTestCase.AwaitsFix(bugUrl = "This an experimental test class")
public class CreateCollectionsIndexAndRestartTest extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void setupCluster() throws Exception {
+ useFactory(null);
configureCluster(5)
.addConfig("conf", configset("cloud-minimal"))
.configure();
diff --git a/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldManagedSchemaCloudTest.java b/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldManagedSchemaCloudTest.java
index 33cf192..e6a8434 100644
--- a/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldManagedSchemaCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldManagedSchemaCloudTest.java
@@ -30,10 +30,8 @@ import org.apache.solr.client.solrj.response.schema.SchemaResponse.UpdateRespons
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.cloud.DocCollection;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore // debug
public class PreAnalyzedFieldManagedSchemaCloudTest extends SolrCloudTestCase {
private static final String COLLECTION = "managed-preanalyzed";
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
index 4bceb9b..3a17f20 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
@@ -16,7 +16,7 @@
*/
package org.apache.solr.schema;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -32,7 +32,7 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
-@Ignore // nocommit debug
+@Ignore // nocommit - debug - update from schema.xml to managed-schema file in zk does not appear to happen? Or is it a race?
public class TestCloudManagedSchema extends AbstractFullDistribZkTestBase {
public TestCloudManagedSchema() {
@@ -50,6 +50,11 @@ public class TestCloudManagedSchema extends AbstractFullDistribZkTestBase {
return "solrconfig-managed-schema.xml";
}
+ @Override
+ public String getCloudSchemaFile() {
+ return "managed-schema";
+ }
+
@Test
public void test() throws Exception {
ModifiableSolrParams params = new ModifiableSolrParams();
@@ -57,12 +62,12 @@ public class TestCloudManagedSchema extends AbstractFullDistribZkTestBase {
QueryRequest request = new QueryRequest(params);
request.setPath("/admin/cores");
int which = r.nextInt(clients.size());
- HttpSolrClient client = (HttpSolrClient)clients.get(which);
+ Http2SolrClient client = (Http2SolrClient)clients.get(which);
String previousBaseURL = client.getBaseURL();
// Strip /collection1 step from baseURL - requests fail otherwise
- client.setBaseURL(previousBaseURL.substring(0, previousBaseURL.lastIndexOf("/")));
+ client.setBaseUrl(previousBaseURL.substring(0, previousBaseURL.lastIndexOf("/")));
NamedList namedListResponse = client.request(request);
- client.setBaseURL(previousBaseURL); // Restore baseURL
+ client.setBaseUrl(previousBaseURL); // Restore baseURL
NamedList status = (NamedList)namedListResponse.get("status");
NamedList collectionStatus = (NamedList)status.getVal(0);
String collectionSchema = (String)collectionStatus.get(CoreAdminParams.SCHEMA);
@@ -72,14 +77,14 @@ public class TestCloudManagedSchema extends AbstractFullDistribZkTestBase {
SolrZkClient zkClient = zkServer.getZkClient();
// Make sure "DO NOT EDIT" is in the content of the managed schema
- String fileContent = getFileContentFromZooKeeper(zkClient, "/solr/configs/conf1/managed-schema");
+ String fileContent = getFileContentFromZooKeeper(zkClient, "/solr/configs/_default/managed-schema");
assertTrue("Managed schema is missing", fileContent.contains("DO NOT EDIT"));
// Make sure the original non-managed schema is no longer in ZooKeeper
- assertFileNotInZooKeeper(zkClient, "/solr/configs/conf1", "schema.xml");
+ assertFileNotInZooKeeper(zkClient, "/solr/configs/_default", "schema.xml");
// Make sure the renamed non-managed schema is present in ZooKeeper
- fileContent = getFileContentFromZooKeeper(zkClient, "/solr/configs/conf1/schema.xml.bak");
+ fileContent = getFileContentFromZooKeeper(zkClient, "/solr/configs/_default/schema.xml.bak");
assertTrue("schema file doesn't contain '<schema'", fileContent.contains("<schema"));
}
diff --git a/solr/core/src/test/org/apache/solr/search/FuzzySearchTest.java b/solr/core/src/test/org/apache/solr/search/FuzzySearchTest.java
index 75c716f..2fca12d 100644
--- a/solr/core/src/test/org/apache/solr/search/FuzzySearchTest.java
+++ b/solr/core/src/test/org/apache/solr/search/FuzzySearchTest.java
@@ -34,7 +34,6 @@ import org.junit.Ignore;
import org.junit.Test;
@LuceneTestCase.Slow
-@Ignore // switched to http2client and I guess it doesn't have this too complex processing
public class FuzzySearchTest extends SolrCloudTestCase {
private final static String COLLECTION = "c1";
private CloudHttp2SolrClient client;
diff --git a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
index 0b39bee..6455045 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
@@ -464,7 +464,6 @@ public class TestRealTimeGet extends TestRTGBase {
@Test
- @Ignore // nocommit I BROKE REALTIME GET, I KNOW, FINISH ADDRESSING
public void testStressGetRealtime() throws Exception {
clearIndex();
assertU(commit());
diff --git a/solr/core/src/test/org/apache/solr/util/TestExportTool.java b/solr/core/src/test/org/apache/solr/util/TestExportTool.java
index c297330..180013c 100644
--- a/solr/core/src/test/org/apache/solr/util/TestExportTool.java
+++ b/solr/core/src/test/org/apache/solr/util/TestExportTool.java
@@ -46,7 +46,6 @@ import org.apache.solr.common.util.JsonRecordReader;
import org.junit.Ignore;
@SolrTestCaseJ4.SuppressSSL
-@Ignore // nocommit flakey
public class TestExportTool extends SolrCloudTestCase {
public void testBasic() throws Exception {