Skip to content

[7.x] Test: match the \ilm/ and \slm/ test name too (#51811) #51919

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
merged 1 commit into from
Feb 5, 2020
Merged

[7.x] Test: match the \ilm/ and \slm/ test name too (#51811) #51919

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
6 changes: 3 additions & 3 deletions 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 @@ -143,14 +143,14 @@ protected boolean preserveTemplatesUponCompletion() {

protected boolean isSLMTest() {
String testName = getTestName();
return testName != null && (testName.contains("/slm/") || testName.contains("\\slm\\") ||
return testName != null && (testName.contains("/slm/") || testName.contains("\\slm\\") || (testName.contains("\\slm/")) ||
// TODO: Remove after backport of https://github.com/elastic/elasticsearch/pull/48705 which moves SLM docs to correct folder
testName.contains("/ilm/") || testName.contains("\\ilm\\"));
testName.contains("/ilm/") || testName.contains("\\ilm\\") || testName.contains("\\ilm/"));
}

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

protected boolean isMachineLearningTest() {
Expand Down