From cf97e14ff0becc008e7606498cb3a6327cf6d040 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Wed, 27 May 2015 20:33:26 -0400 Subject: [PATCH] mark slow tests --- .gitignore | 1 + .../test/integration/EncryptedAttachmentIntegrationTests.java | 2 ++ .../test/integration/SimpleAttachmentIntegrationTests.java | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9533848e238..6f32f60a650 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /plugin_tools /.local-execution-hints.log /.local-*-execution-hints.log +/eclipse-build/ diff --git a/src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/EncryptedAttachmentIntegrationTests.java b/src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/EncryptedAttachmentIntegrationTests.java index 5fc9bfccda7..6a1f94d613d 100644 --- a/src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/EncryptedAttachmentIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/EncryptedAttachmentIntegrationTests.java @@ -24,6 +24,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.plugins.PluginsService; import org.junit.Test; +import org.apache.lucene.util.LuceneTestCase.Slow; import static org.elasticsearch.client.Requests.putMappingRequest; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -36,6 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Test case for issue https://github.com/elasticsearch/elasticsearch-mapper-attachments/issues/18 */ +@Slow public class EncryptedAttachmentIntegrationTests extends AttachmentIntegrationTestCase { private boolean ignore_errors = true; diff --git a/src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/SimpleAttachmentIntegrationTests.java b/src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/SimpleAttachmentIntegrationTests.java index 12618b706c1..e58ce74a627 100644 --- a/src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/SimpleAttachmentIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/SimpleAttachmentIntegrationTests.java @@ -29,6 +29,7 @@ import org.elasticsearch.search.highlight.HighlightField; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.apache.lucene.util.LuceneTestCase.Slow; import static org.elasticsearch.client.Requests.putMappingRequest; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -37,11 +38,11 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsString; /** * */ +@Slow public class SimpleAttachmentIntegrationTests extends AttachmentIntegrationTestCase { @Override