Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove testSearchWithBasicLicensedQuery #73

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1380,16 +1380,6 @@ public void testCountAllIndicesMatchQuery() throws IOException {
assertEquals(3, countResponse.getCount());
}

public void testSearchWithBasicLicensedQuery() throws IOException {
SearchRequest searchRequest = new SearchRequest("index");
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
searchRequest.source(searchSourceBuilder);
SearchResponse searchResponse = execute(searchRequest, highLevelClient()::search, highLevelClient()::searchAsync);
assertSearchHeader(searchResponse);
assertFirstHit(searchResponse, hasId("2"));
assertSecondHit(searchResponse, hasId("1"));
}

private static void assertCountHeader(CountResponse countResponse) {
assertEquals(0, countResponse.getSkippedShards());
assertEquals(0, countResponse.getFailedShards());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.elasticsearch.client.analytics;

import org.apache.lucene.util.LuceneTestCase.BadApple;
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.search.SearchRequest;
Expand All @@ -41,6 +42,7 @@
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasSize;

@BadApple(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/51")
public class AnalyticsAggsIT extends ESRestHighLevelClientTestCase {
public void testStringStats() throws IOException {
BulkRequest bulk = new BulkRequest("test").setRefreshPolicy(RefreshPolicy.IMMEDIATE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@

import java.io.IOException;

import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assume.assumeThat;

public class RemoteClustersIT extends AbstractMultiClusterRemoteTestCase {

@Before
Expand Down
48 changes: 24 additions & 24 deletions qa/verify-version-constants/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,28 @@ for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) {
}
}

tasks.register("verifyDocsLuceneVersion") {
doFirst {
File docsVersionsFile = rootProject.file('docs/Versions.asciidoc')
List<String> versionLines = docsVersionsFile.readLines('UTF-8')
String docsLuceneVersion = null
for (String line : versionLines) {
if (line.startsWith(':lucene_version:')) {
docsLuceneVersion = line.split()[1]
}
}
if (docsLuceneVersion == null) {
throw new GradleException('Could not find lucene version in docs version file')
}
String expectedLuceneVersion = VersionProperties.lucene
// remove potential -snapshot-{gitrev} suffix
expectedLuceneVersion -= ~/-snapshot-[0-9a-f]+$/
if (docsLuceneVersion != expectedLuceneVersion) {
throw new GradleException("Lucene version in docs [${docsLuceneVersion}] does not match version.properties [${expectedLuceneVersion}]")
}
}
}
//tasks.register("verifyDocsLuceneVersion") {
// doFirst {
// File docsVersionsFile = rootProject.file('docs/Versions.asciidoc')
// List<String> versionLines = docsVersionsFile.readLines('UTF-8')
// String docsLuceneVersion = null
// for (String line : versionLines) {
// if (line.startsWith(':lucene_version:')) {
// docsLuceneVersion = line.split()[1]
// }
// }
// if (docsLuceneVersion == null) {
// throw new GradleException('Could not find lucene version in docs version file')
// }
// String expectedLuceneVersion = VersionProperties.lucene
// // remove potential -snapshot-{gitrev} suffix
// expectedLuceneVersion -= ~/-snapshot-[0-9a-f]+$/
// if (docsLuceneVersion != expectedLuceneVersion) {
// throw new GradleException("Lucene version in docs [${docsLuceneVersion}] does not match version.properties [${expectedLuceneVersion}]")
// }
// }
//}

tasks.named("check").configure {
dependsOn verifyDocsLuceneVersion
}
//tasks.named("check").configure {
// dependsOn verifyDocsLuceneVersion
//}
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
import static org.elasticsearch.discovery.zen.ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING;
import static org.elasticsearch.test.ESTestCase.assertBusy;
import static org.elasticsearch.test.ESTestCase.getTestTransportType;
import static org.elasticsearch.test.ESTestCase.inFipsJvm;
import static org.elasticsearch.test.ESTestCase.randomFrom;
import static org.elasticsearch.test.NodeRoles.dataOnlyNode;
import static org.elasticsearch.test.NodeRoles.masterOnlyNode;
Expand Down