Skip to content

Ensure license is ready for xpack info doc tests (#60706) #60708

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.

Sign up for GitHub

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

Merged
ywangd merged 1 commit into from
Aug 5, 2020
Merged

Ensure license is ready for xpack info doc tests (#60706) #60708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ protected ClientYamlTestClient initClientYamlTestClient(

@Before
public void waitForRequirements() throws Exception {
if (isCcrTest() || isGetLicenseTest()) {
if (isCcrTest() || isGetLicenseTest() || isXpackInfoTest()) {
ESRestTestCase.waitForActiveLicense(adminClient());
}
}
Expand Down Expand Up @@ -180,6 +180,11 @@ protected boolean isGetLicenseTest() {
return testName != null && (testName.contains("/get-license/") || testName.contains("\\get-license\\"));
}

protected boolean isXpackInfoTest() {
String testName = getTestName();
return testName != null && (testName.contains("/info/") || testName.contains("\\info\\"));
}

/**
* Compares the results of running two analyzers against many random
* strings. The goal is to figure out if two anlayzers are "the same" by
Expand Down