Skip to content

Commit ec3a575

Browse files
prwhelanelasticsearchmachine
authored andcommitted
[Transform] Remove extra reset calls (elastic#137346)
ESRestTestCase already calls the `_reset` API, we do not need to do it twice. Co-authored-by: elasticsearchmachine <[email protected]>
1 parent 2a8d7e4 commit ec3a575

File tree

4 files changed

+0
-22
lines changed

4 files changed

+0
-22
lines changed

x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformGetAndGetStatsIT.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.core.Strings;
1717
import org.elasticsearch.xpack.core.transform.TransformField;
1818
import org.elasticsearch.xpack.core.transform.transforms.persistence.TransformInternalIndexConstants;
19-
import org.junit.After;
2019
import org.junit.Before;
2120

2221
import java.io.IOException;
@@ -64,11 +63,6 @@ public void createIndexes() throws IOException {
6463

6564
}
6665

67-
@After
68-
public void clearOutTransforms() throws Exception {
69-
adminClient().performRequest(new Request("POST", "/_features/_reset"));
70-
}
71-
7266
@SuppressWarnings("unchecked")
7367
public void testGetAndGetStats() throws Exception {
7468
createPivotReviewsTransform("pivot_1", "pivot_reviews_1", null);

x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformRestTestCase.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -647,9 +647,6 @@ protected static void deleteTransform(String transformId, boolean ignoreNotFound
647647
public void waitForTransform() throws Exception {
648648
ensureNoInitializingShards();
649649
logAudits();
650-
if (preserveClusterUponCompletion() == false) {
651-
adminClient().performRequest(new Request("POST", "/_features/_reset"));
652-
}
653650
}
654651

655652
@AfterClass

x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformTaskFailedStateIT.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.rest.RestStatus;
1717
import org.elasticsearch.xcontent.XContentBuilder;
1818
import org.elasticsearch.xpack.core.transform.transforms.TransformStats;
19-
import org.junit.After;
2019
import org.junit.Before;
2120

2221
import java.io.IOException;
@@ -52,11 +51,6 @@ public void setClusterSettings() throws IOException {
5251
client().performRequest(addFailureRetrySetting);
5352
}
5453

55-
@After
56-
public void cleanUpPotentiallyFailedTransform() throws Exception {
57-
adminClient().performRequest(new Request("POST", "/_features/_reset"));
58-
}
59-
6054
public void testForceStopFailedTransform() throws Exception {
6155
String transformId = "test-force-stop-failed-transform";
6256
createReviewsIndex(REVIEWS_INDEX_NAME, 10, 27, "date", false, -1, null);

x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUpgradeModeIT.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77

88
package org.elasticsearch.xpack.transform.integration;
99

10-
import org.elasticsearch.client.Request;
1110
import org.elasticsearch.client.Response;
1211
import org.elasticsearch.client.ResponseException;
1312
import org.elasticsearch.common.xcontent.support.XContentMapValues;
1413
import org.elasticsearch.core.CheckedRunnable;
1514
import org.elasticsearch.xpack.core.transform.TransformField;
1615
import org.elasticsearch.xpack.core.transform.transforms.TransformStats;
17-
import org.junit.After;
1816
import org.junit.Before;
1917

2018
import java.io.IOException;
@@ -51,11 +49,6 @@ public void createIndexes() throws IOException {
5149
indicesCreated = true;
5250
}
5351

54-
@After
55-
public void clearOutTransforms() throws Exception {
56-
adminClient().performRequest(new Request("POST", "/_features/_reset"));
57-
}
58-
5952
public void testUpgradeMode() throws Exception {
6053
var transformId = startTransform();
6154

0 commit comments

Comments
 (0)