Skip to content

Commit bca34f1

Browse files
[8.18] Remove call to super.cleanupCluster in cleanup methods which does not override parent method (#122209) (#122259)
* Remove call to super.cleanupCluster in cleanup methods which does not override parent method (#122209) ReindexDataStreamIndexAction.cleanupCluster called EsIntegTestCase.cleanupCluster, but did not override it. This caused EsIntegTestCase.cleanupCluster to be called twice, once in ReindexDataStreamIndexAction.cleanupCluster and once when the After annotation is called on EsIntegTestCase. (cherry picked from commit 89ba03e) # Conflicts: # muted-tests.yml # x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java * deletePipeline not available in 8.x
1 parent 9c1785a commit bca34f1

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,13 @@
7070

7171
public class ReindexDatastreamIndexTransportActionIT extends ESIntegTestCase {
7272
@After
73-
private void cleanupCluster() throws Exception {
73+
private void cleanup() {
7474
safeGet(
7575
clusterAdmin().execute(
7676
DeletePipelineTransportAction.TYPE,
7777
new DeletePipelineRequest(MigrateTemplateRegistry.REINDEX_DATA_STREAM_PIPELINE_NAME)
7878
)
7979
);
80-
super.cleanUpCluster();
8180
}
8281

8382
private static final String MAPPING = """

0 commit comments

Comments
 (0)