Ver Fonte

[8.x] Remove call to super.cleanupCluster in cleanup methods which does not override parent method (#122209) (#122258)

* 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 89ba03ecff8c4657a341371f3ddc8b116d67f9a0)

# Conflicts:
#	muted-tests.yml
#	x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java

* deletePipeline not available in 8.x
Parker Timmins há 8 meses atrás
pai
commit
3d35bdec8e

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

@@ -70,14 +70,13 @@ import static org.hamcrest.Matchers.equalTo;
 
 public class ReindexDatastreamIndexTransportActionIT extends ESIntegTestCase {
     @After
-    private void cleanupCluster() throws Exception {
+    private void cleanup() {
         safeGet(
             clusterAdmin().execute(
                 DeletePipelineTransportAction.TYPE,
                 new DeletePipelineRequest(MigrateTemplateRegistry.REINDEX_DATA_STREAM_PIPELINE_NAME)
             )
         );
-        super.cleanUpCluster();
     }
 
     private static final String MAPPING = """