Skip to content

Commit 971bcbf

Browse files
committed
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 d2fbb0d commit 971bcbf

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
@@ -8,7 +8,6 @@ import org.elasticsearch.gradle.internal.info.BuildParams
88
* your election, the "Elastic License 2.0", the "GNU Affero General Public
99
* License v3.0 only", or the "Server Side Public License, v 1".
1010
*/
11-
apply plugin: 'elasticsearch.internal-cluster-test'
1211
apply plugin: 'elasticsearch.internal-java-rest-test'
1312

1413
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

@@ -264,26 +263,6 @@
264263
@LuceneTestCase.SuppressFileSystems("ExtrasFS") // doesn't work with potential multi data path from test cluster yet
265264
public abstract class ESIntegTestCase extends ESTestCase {
266265

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

0 commit comments

Comments
 (0)