Skip to content

Commit 5e467bf

Browse files
authored
Drop unused @ThirdParty tests (#118432)
We don't run any such tests in CI, and probably haven't even run them manually for years. The only such test with this annotation is a trivial smoke test for `discovery-ec2` that is equally well covered by the Java REST test suite.
1 parent 6209b4f commit 5e467bf

File tree

4 files changed

+0
-127
lines changed

4 files changed

+0
-127
lines changed

plugins/discovery-ec2/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* your election, the "Elastic License 2.0", the "GNU Affero General Public
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
9-
apply plugin: 'elasticsearch.internal-cluster-test'
109
apply plugin: 'elasticsearch.internal-java-rest-test'
1110

1211
esplugin {

plugins/discovery-ec2/src/internalClusterTest/java/org/elasticsearch/discovery/ec2/AbstractAwsTestCase.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

plugins/discovery-ec2/src/internalClusterTest/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.netty.util.concurrent.GlobalEventExecutor;
1414

1515
import com.carrotsearch.randomizedtesting.RandomizedContext;
16-
import com.carrotsearch.randomizedtesting.annotations.TestGroup;
1716
import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
1817
import com.carrotsearch.randomizedtesting.generators.RandomPicks;
1918

@@ -273,26 +272,6 @@
273272
@LuceneTestCase.SuppressFileSystems("ExtrasFS") // doesn't work with potential multi data path from test cluster yet
274273
public abstract class ESIntegTestCase extends ESTestCase {
275274

276-
/**
277-
* Property that controls whether ThirdParty Integration tests are run (not the default).
278-
*/
279-
public static final String SYSPROP_THIRDPARTY = "tests.thirdparty";
280-
281-
/**
282-
* Annotation for third-party integration tests.
283-
* <p>
284-
* These are tests, which require a third-party service in order to run. They
285-
* may require the user to manually configure an external process (such as rabbitmq),
286-
* or may additionally require some external configuration (e.g. AWS credentials)
287-
* via the {@code tests.config} system property.
288-
*/
289-
@Inherited
290-
@Retention(RetentionPolicy.RUNTIME)
291-
@Target(ElementType.TYPE)
292-
@TestGroup(enabled = false, sysProperty = ESIntegTestCase.SYSPROP_THIRDPARTY)
293-
public @interface ThirdParty {
294-
}
295-
296275
/** node names of the corresponding clusters will start with these prefixes */
297276
public static final String SUITE_CLUSTER_NODE_PREFIX = "node_s";
298277
public static final String TEST_CLUSTER_NODE_PREFIX = "node_t";

0 commit comments

Comments
 (0)