Skip to content

Commit

Permalink
Don't use ml rest cleaner
Browse files Browse the repository at this point in the history
  • Loading branch information
davidkyle committed Nov 8, 2024
1 parent e2c29f5 commit dc5a4a8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 41 deletions.
30 changes: 0 additions & 30 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,6 @@ tests:
- class: org.elasticsearch.search.SearchServiceTests
method: testParseSourceValidation
issue: https://github.com/elastic/elasticsearch/issues/115936
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/inference_crud/Test delete given model referenced by pipeline}
issue: https://github.com/elastic/elasticsearch/issues/115970
- class: org.elasticsearch.search.slice.SearchSliceIT
method: testPointInTime
issue: https://github.com/elastic/elasticsearch/issues/115988
Expand Down Expand Up @@ -204,9 +201,6 @@ tests:
- class: org.elasticsearch.xpack.ml.integration.DatafeedJobsRestIT
method: testLookbackWithIndicesOptions
issue: https://github.com/elastic/elasticsearch/issues/116127
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/inference_crud/Test delete given model with alias referenced by pipeline}
issue: https://github.com/elastic/elasticsearch/issues/116133
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
method: test {categorize.Categorize SYNC}
issue: https://github.com/elastic/elasticsearch/issues/113054
Expand All @@ -216,36 +210,21 @@ tests:
- class: org.elasticsearch.xpack.inference.InferenceRestIT
method: test {p0=inference/40_semantic_text_query/Query a field that uses the default ELSER 2 endpoint}
issue: https://github.com/elastic/elasticsearch/issues/114376
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/inference_crud/Test force delete given model with alias referenced by pipeline}
issue: https://github.com/elastic/elasticsearch/issues/116136
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=transform/transforms_start_stop/Test start already started transform}
issue: https://github.com/elastic/elasticsearch/issues/98802
- class: org.elasticsearch.action.search.SearchPhaseControllerTests
method: testProgressListener
issue: https://github.com/elastic/elasticsearch/issues/116149
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/forecast/Test forecast unknown job}
issue: https://github.com/elastic/elasticsearch/issues/116150
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=terms_enum/10_basic/Test security}
issue: https://github.com/elastic/elasticsearch/issues/116178
- class: org.elasticsearch.search.basic.SearchWithRandomDisconnectsIT
method: testSearchWithRandomDisconnects
issue: https://github.com/elastic/elasticsearch/issues/116175
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/start_stop_datafeed/Test start datafeed given index pattern with no matching indices}
issue: https://github.com/elastic/elasticsearch/issues/116220
- class: org.elasticsearch.search.basic.SearchWhileRelocatingIT
method: testSearchAndRelocateConcurrentlyRandomReplicas
issue: https://github.com/elastic/elasticsearch/issues/116145
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/filter_crud/Test update filter}
issue: https://github.com/elastic/elasticsearch/issues/116271
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/get_datafeeds/Test explicit get all datafeeds}
issue: https://github.com/elastic/elasticsearch/issues/116284
- class: org.elasticsearch.xpack.deprecation.DeprecationHttpIT
method: testDeprecatedSettingsReturnWarnings
issue: https://github.com/elastic/elasticsearch/issues/108628
Expand Down Expand Up @@ -273,21 +252,12 @@ tests:
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/jobs_crud/Test put job deprecated bucket span}
issue: https://github.com/elastic/elasticsearch/issues/116419
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/explain_data_frame_analytics/Test both job id and body}
issue: https://github.com/elastic/elasticsearch/issues/116433
- class: org.elasticsearch.smoketest.MlWithSecurityIT
method: test {yaml=ml/inference_crud/Test force delete given model with alias referenced by pipeline}
issue: https://github.com/elastic/elasticsearch/issues/116443
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version}
issue: https://github.com/elastic/elasticsearch/issues/116448
- class: org.elasticsearch.xpack.downsample.ILMDownsampleDisruptionIT
method: testILMDownsampleRollingRestart
issue: https://github.com/elastic/elasticsearch/issues/114233
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/data_frame_analytics_crud/Test put config with unknown field in outlier detection analysis}
issue: https://github.com/elastic/elasticsearch/issues/116458

# Examples:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.elasticsearch.test.rest.yaml.ClientYamlTestResponse;
import org.elasticsearch.test.rest.yaml.ClientYamlTestResponseException;
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
import org.elasticsearch.xpack.core.ml.integration.MlRestTestStateCleaner;
import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndex;
import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndexFields;
import org.elasticsearch.xpack.core.ml.notifications.NotificationsIndex;
Expand Down Expand Up @@ -115,7 +114,6 @@ protected void waitForLicense() {
*/
@After
public void cleanup() throws Exception {
clearMlState();
if (isWaitForPendingTasks()) {
// This waits for pending tasks to complete, so must go last (otherwise
// it could be waiting for pending tasks while monitoring is still running).
Expand All @@ -130,15 +128,6 @@ protected Predicate<String> waitForPendingTasksFilter() {
};
}

/**
* Delete any left over machine learning datafeeds and jobs.
*/
private void clearMlState() throws Exception {
if (isMachineLearningTest()) {
new MlRestTestStateCleaner(logger, adminClient()).resetFeatures();
}
}

/**
* Executes an API call using the admin context, waiting for it to succeed.
*/
Expand Down

0 comments on commit dc5a4a8

Please sign in to comment.