From c949ce00e8276d570418293373ad33c5cbaf5319 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Wed, 13 May 2015 14:34:53 -0400 Subject: [PATCH 1/2] Add test group for third-party tests --- .../test/ElasticsearchIntegrationTest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java index 67991a896ea..d862a4635e2 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java @@ -243,6 +243,26 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase public @interface Integration { } + /** + * Property that controls whether ThirdParty Integration tests are run (not the default). + */ + public static final String SYSPROP_THIRDPARTY = "tests.thirdparty"; + + /** + * Annotation for third-party integration tests. + *

+ * These are tests the require a third-party service in order to run. They + * may require the user to manually configure an external process (such as rabbitmq), + * or may additionally require some external configuration (e.g. AWS credentials) + * via the {@code tests.config} system property. + */ + @Inherited + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.TYPE) + @TestGroup(enabled = false, sysProperty = ElasticsearchIntegrationTest.SYSPROP_THIRDPARTY) + public @interface ThirdParty { + } + /** node names of the corresponding clusters will start with these prefixes */ public static final String SUITE_CLUSTER_NODE_PREFIX = "node_s"; public static final String TEST_CLUSTER_NODE_PREFIX = "node_t"; From 3dd706f1e630047830a363d5615db288dfc5c5ed Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Wed, 13 May 2015 14:56:29 -0400 Subject: [PATCH 2/2] Add these two props for consistency, so we aren't confused when we deduplicate with elasticsearch-parent --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index a396fa4f8c9..cc0f43de08d 100644 --- a/pom.xml +++ b/pom.xml @@ -616,6 +616,8 @@ ${tests.timeoutSuite} ${tests.showSuccess} ${tests.integration} + ${tests.thirdparty} + ${tests.config} ${tests.client.ratio} ${tests.enable_mock_modules} ${tests.assertion.disabled}