From b728772fe4993a3cd067b9327128f11ad55ffde0 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Sat, 18 Apr 2015 19:59:29 -0400 Subject: [PATCH] more fine-grained @slow tuning, remove from many tests that got unlucky with fsync --- pom.xml | 3 ++- .../action/admin/indices/create/CreateIndexTests.java | 2 -- .../org/elasticsearch/action/bulk/BulkIntegrationTests.java | 2 -- .../org/elasticsearch/action/bulk/BulkProcessorTests.java | 2 -- .../action/termvectors/MultiTermVectorsTests.java | 2 -- .../java/org/elasticsearch/blocks/SimpleBlocksTests.java | 2 -- .../org/elasticsearch/cluster/BlockClusterStatsTests.java | 2 -- .../java/org/elasticsearch/cluster/ClusterHealthTests.java | 2 -- .../java/org/elasticsearch/cluster/ClusterServiceTests.java | 4 +--- .../org/elasticsearch/cluster/MinimumMasterNodesTests.java | 4 +--- .../org/elasticsearch/cluster/SimpleClusterStateTests.java | 2 -- .../elasticsearch/cluster/settings/ClusterSettingsTests.java | 2 -- .../java/org/elasticsearch/count/query/CountQueryTests.java | 2 -- .../org/elasticsearch/count/simple/SimpleCountTests.java | 2 -- src/test/java/org/elasticsearch/document/BulkTests.java | 2 -- src/test/java/org/elasticsearch/document/ShardInfoTests.java | 2 -- .../java/org/elasticsearch/exists/SimpleExistsTests.java | 2 -- src/test/java/org/elasticsearch/get/GetActionTests.java | 2 -- .../elasticsearch/index/IndexWithShadowReplicasTests.java | 3 --- .../index/fielddata/FSTPackedBytesStringFieldDataTests.java | 2 -- .../elasticsearch/index/fielddata/FieldDataLoadingTests.java | 2 -- .../index/fielddata/NoOrdinalsStringFieldDataTests.java | 2 -- .../externalvalues/ExternalValuesMapperIntegrationTests.java | 2 -- .../index/mapper/update/UpdateMappingOnClusterTests.java | 2 -- .../index/query/SimpleIndexQueryParserTests.java | 2 -- .../org/elasticsearch/index/query/TemplateQueryTest.java | 2 -- .../java/org/elasticsearch/indexing/IndexActionTests.java | 4 +--- .../indices/IndicesOptionsIntegrationTests.java | 2 -- .../indices/mapping/ConcurrentDynamicTemplateTests.java | 2 -- .../elasticsearch/indices/mapping/UpdateMappingTests.java | 2 -- .../indices/settings/UpdateNumberOfReplicasTests.java | 2 -- .../org/elasticsearch/indices/state/OpenCloseIndexTests.java | 2 -- .../indices/store/IndicesStoreIntegrationTests.java | 4 +--- .../elasticsearch/indices/store/SimpleDistributorTests.java | 2 -- .../java/org/elasticsearch/mlt/MoreLikeThisActionTests.java | 2 -- .../DestructiveOperationsIntegrationTests.java | 2 -- .../elasticsearch/percolator/ConcurrentPercolatorTests.java | 2 -- .../percolator/PercolatorFacetsAndAggregationsTests.java | 2 -- .../java/org/elasticsearch/percolator/PercolatorTests.java | 2 -- .../org/elasticsearch/percolator/TTLPercolatorTests.java | 2 -- .../java/org/elasticsearch/recovery/RelocationTests.java | 2 +- .../java/org/elasticsearch/recovery/SimpleRecoveryTests.java | 2 -- .../recovery/SmallTranslogOpsRecoveryTests.java | 2 -- .../java/org/elasticsearch/routing/SimpleRoutingTests.java | 2 -- .../org/elasticsearch/script/CustomScriptContextTests.java | 2 -- src/test/java/org/elasticsearch/script/IndexLookupTests.java | 2 -- .../java/org/elasticsearch/script/OnDiskScriptTests.java | 2 -- .../org/elasticsearch/script/ScriptIndexSettingsTest.java | 2 -- .../org/elasticsearch/search/aggregations/CombiTests.java | 2 -- .../search/aggregations/bucket/ChildrenTests.java | 2 -- .../aggregations/bucket/DedicatedAggregationTests.java | 2 -- .../search/aggregations/bucket/DoubleTermsTests.java | 2 -- .../search/aggregations/bucket/FiltersTests.java | 2 -- .../search/aggregations/bucket/HistogramTests.java | 2 -- .../search/aggregations/bucket/IPv4RangeTests.java | 2 -- .../search/aggregations/bucket/LongTermsTests.java | 2 -- .../search/aggregations/bucket/MinDocCountTests.java | 2 -- .../search/aggregations/bucket/NestedTests.java | 2 -- .../search/aggregations/bucket/ParentIdAggTests.java | 2 -- .../search/aggregations/bucket/ShardSizeTermsTests.java | 2 -- .../bucket/SignificantTermsSignificanceScoreTests.java | 2 -- .../search/aggregations/bucket/StringTermsTests.java | 2 -- .../search/aggregations/bucket/TermsDocCountErrorTests.java | 2 -- .../aggregations/bucket/TermsShardMinDocCountTests.java | 2 -- .../search/aggregations/metrics/AbstractNumericTests.java | 2 -- .../search/aggregations/metrics/CardinalityTests.java | 2 -- .../search/aggregations/metrics/GeoBoundsTests.java | 2 -- .../elasticsearch/search/aggregations/metrics/SumTests.java | 2 -- .../search/basic/SearchWithRandomExceptionsTests.java | 2 -- .../search/basic/TransportTwoNodesSearchTests.java | 2 -- .../search/child/SimpleChildQuerySearchTests.java | 4 +--- .../search/compress/SearchSourceCompressTests.java | 2 -- .../search/functionscore/DecayFunctionScoreTests.java | 2 -- .../search/functionscore/RandomScoreFunctionTests.java | 3 +-- .../elasticsearch/search/geo/GeoShapeIntegrationTests.java | 2 -- .../org/elasticsearch/search/innerhits/InnerHitsTests.java | 2 -- .../org/elasticsearch/search/query/ExistsMissingTests.java | 2 -- .../org/elasticsearch/search/query/MultiMatchQueryTests.java | 2 -- .../elasticsearch/search/query/SimpleQueryStringTests.java | 2 -- .../org/elasticsearch/search/rescore/QueryRescorerTests.java | 4 +--- .../search/scriptfilter/ScriptFilterSearchTests.java | 2 -- .../java/org/elasticsearch/search/sort/SimpleSortTests.java | 5 ++--- .../search/suggest/CompletionSuggestSearchTests.java | 2 -- .../search/suggest/ContextSuggestSearchTests.java | 2 -- .../java/org/elasticsearch/snapshots/RepositoriesTests.java | 2 -- .../test/junit/listeners/ReproduceInfoPrinter.java | 1 + .../elasticsearch/test/rest/ElasticsearchRestTestCase.java | 2 ++ .../org/elasticsearch/test/test/SuiteScopeClusterTests.java | 2 -- .../org/elasticsearch/test/test/TestScopeClusterTests.java | 2 -- .../org/elasticsearch/timestamp/SimpleTimestampTests.java | 2 -- src/test/java/org/elasticsearch/update/UpdateTests.java | 2 -- .../org/elasticsearch/validate/SimpleValidateQueryTests.java | 2 -- 92 files changed, 15 insertions(+), 186 deletions(-) diff --git a/pom.xml b/pom.xml index 51375dd9c49..c79b2e09fc7 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,8 @@ ${project.basedir}/backwards random random - INFO + false + ERROR 512m ${basedir}/logs/ 5 diff --git a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java b/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java index b4846c5bb33..638c9a61fb4 100644 --- a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java +++ b/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.create; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cluster.ClusterState; @@ -39,7 +38,6 @@ import static org.hamcrest.Matchers.*; import static org.hamcrest.core.IsNull.notNullValue; @ClusterScope(scope = Scope.TEST) -@Slow public class CreateIndexTests extends ElasticsearchIntegrationTest{ @Test diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java index 3717d2fcbf5..bace2472a3c 100644 --- a/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java +++ b/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java @@ -22,14 +22,12 @@ package org.elasticsearch.action.bulk; import com.google.common.base.Charsets; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; -@Slow public class BulkIntegrationTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java index 84b3a7a48a8..e357206bc38 100644 --- a/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java +++ b/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.action.bulk; import com.carrotsearch.ant.tasks.junit4.dependencies.com.carrotsearch.randomizedtesting.generators.RandomPicks; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.get.MultiGetItemResponse; import org.elasticsearch.action.get.MultiGetRequestBuilder; import org.elasticsearch.action.get.MultiGetResponse; @@ -48,7 +47,6 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -@Slow public class BulkProcessorTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsTests.java b/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsTests.java index 0c031e0f258..ecc767c3274 100644 --- a/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsTests.java +++ b/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsTests.java @@ -23,7 +23,6 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Fields; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.common.settings.ImmutableSettings; @@ -34,7 +33,6 @@ import java.io.IOException; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -@Slow public class MultiTermVectorsTests extends AbstractTermVectorsTests { @Test diff --git a/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java b/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java index 98f112d932d..a68fccf4f58 100644 --- a/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java +++ b/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.blocks; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse; import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequestBuilder; @@ -39,7 +38,6 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.Matchers.notNullValue; @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -@Slow public class SimpleBlocksTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/cluster/BlockClusterStatsTests.java b/src/test/java/org/elasticsearch/cluster/BlockClusterStatsTests.java index 3f46e6da7bb..31abbc2c020 100644 --- a/src/test/java/org/elasticsearch/cluster/BlockClusterStatsTests.java +++ b/src/test/java/org/elasticsearch/cluster/BlockClusterStatsTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.cluster; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.indices.alias.Alias; @@ -38,7 +37,6 @@ import static org.hamcrest.Matchers.*; * Scoped as test, because the if the test with cluster read only block fails, all other tests fail as well, as this is not cleaned up properly */ @ClusterScope(scope= Scope.TEST) -@Slow public class BlockClusterStatsTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java b/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java index 41736592c0b..658da8bde36 100644 --- a/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java +++ b/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.Priority; @@ -28,7 +27,6 @@ import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -@Slow public class ClusterHealthTests extends ElasticsearchIntegrationTest { diff --git a/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java b/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java index 080d650cf0b..cd393ff88cd 100644 --- a/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java +++ b/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.cluster; import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksResponse; @@ -55,7 +54,6 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -@Slow public class ClusterServiceTests extends ElasticsearchIntegrationTest { @Test @@ -605,7 +603,7 @@ public class ClusterServiceTests extends ElasticsearchIntegrationTest { block2.countDown(); } - @Test + @Test @Slow public void testLocalNodeMasterListenerCallbacks() throws Exception { Settings settings = settingsBuilder() .put("discovery.type", "zen") diff --git a/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java b/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java index 11e8bf17ff2..fedd3aca276 100644 --- a/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java +++ b/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.cluster; import com.google.common.base.Predicate; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.client.Client; @@ -49,7 +48,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThro import static org.hamcrest.Matchers.*; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -@Slow public class MinimumMasterNodesTests extends ElasticsearchIntegrationTest { @Test @@ -172,7 +170,7 @@ public class MinimumMasterNodesTests extends ElasticsearchIntegrationTest { } } - @Test + @Test @Slow public void multipleNodesShutdownNonMasterNodes() throws Exception { Settings settings = settingsBuilder() .put("discovery.type", "zen") diff --git a/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java b/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java index 43ba49f4ea2..750432f0a1f 100644 --- a/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java +++ b/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse; import org.elasticsearch.action.support.IndicesOptions; @@ -45,7 +44,6 @@ import static org.hamcrest.Matchers.*; * Checking simple filtering capabilites of the cluster state * */ -@Slow public class SimpleClusterStateTests extends ElasticsearchIntegrationTest { @Before diff --git a/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java b/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java index 9ece6f0054a..9947c1a12b8 100644 --- a/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java +++ b/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.settings; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; import org.elasticsearch.cluster.routing.allocation.decider.DisableAllocationDecider; import org.elasticsearch.common.settings.ImmutableSettings; @@ -35,7 +34,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.hamcrest.Matchers.*; @ClusterScope(scope = TEST) -@Slow public class ClusterSettingsTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/count/query/CountQueryTests.java b/src/test/java/org/elasticsearch/count/query/CountQueryTests.java index 6afc6aceddb..0f77e83c03a 100644 --- a/src/test/java/org/elasticsearch/count/query/CountQueryTests.java +++ b/src/test/java/org/elasticsearch/count/query/CountQueryTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.count.query; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.Version; import org.elasticsearch.action.ShardOperationFailedException; @@ -48,7 +47,6 @@ import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -@Slow public class CountQueryTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java index e2589734c89..dd4ed24af5a 100644 --- a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java +++ b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.count.simple; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -39,7 +38,6 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -@Slow public class SimpleCountTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/document/BulkTests.java b/src/test/java/org/elasticsearch/document/BulkTests.java index c8c960fa4ce..f49914606dd 100644 --- a/src/test/java/org/elasticsearch/document/BulkTests.java +++ b/src/test/java/org/elasticsearch/document/BulkTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.document; import com.google.common.base.Charsets; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.bulk.BulkItemResponse; @@ -61,7 +60,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -@Slow public class BulkTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/document/ShardInfoTests.java b/src/test/java/org/elasticsearch/document/ShardInfoTests.java index f1f5a7435a2..22533eaef69 100644 --- a/src/test/java/org/elasticsearch/document/ShardInfoTests.java +++ b/src/test/java/org/elasticsearch/document/ShardInfoTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.document; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.ActionWriteResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.recovery.RecoveryResponse; @@ -42,7 +41,6 @@ import static org.hamcrest.Matchers.*; /** */ -@Slow public class ShardInfoTests extends ElasticsearchIntegrationTest { private int numCopies; diff --git a/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java b/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java index bda8c7748d2..78e50de0f50 100644 --- a/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java +++ b/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.exists; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.exists.ExistsResponse; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; @@ -30,7 +29,6 @@ import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertExists; -@Slow public class SimpleExistsTests extends ElasticsearchIntegrationTest { diff --git a/src/test/java/org/elasticsearch/get/GetActionTests.java b/src/test/java/org/elasticsearch/get/GetActionTests.java index b7d70be0c5b..071cccd4f46 100644 --- a/src/test/java/org/elasticsearch/get/GetActionTests.java +++ b/src/test/java/org/elasticsearch/get/GetActionTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.get; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.action.ShardOperationFailedException; @@ -47,7 +46,6 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -@Slow public class GetActionTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java b/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java index 9741aaae43f..c0a63d22922 100644 --- a/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java +++ b/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java @@ -19,8 +19,6 @@ package org.elasticsearch.index; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; @@ -55,7 +53,6 @@ import static org.hamcrest.Matchers.*; * Tests for indices that use shadow replicas and a shared filesystem */ @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) -@Slow public class IndexWithShadowReplicasTests extends ElasticsearchIntegrationTest { /** diff --git a/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java index b6e157bac44..c881a5e4aa9 100644 --- a/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java @@ -19,13 +19,11 @@ package org.elasticsearch.index.fielddata; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder; /** */ -@Slow public class FSTPackedBytesStringFieldDataTests extends AbstractStringFieldDataTests { @Override diff --git a/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java b/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java index f9400fbe126..b3b820be0fb 100644 --- a/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.fielddata; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; @@ -30,7 +29,6 @@ import static org.hamcrest.Matchers.greaterThan; /** */ -@Slow public class FieldDataLoadingTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java index 3e09d9df1d5..99bc38b5c84 100644 --- a/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.index.fielddata; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; @@ -31,7 +30,6 @@ import org.junit.Test; /** Returns an implementation based on paged bytes which doesn't implement WithOrdinals in order to visit different paths in the code, * eg. BytesRefFieldComparatorSource makes decisions based on whether the field data implements WithOrdinals. */ -@Slow public class NoOrdinalsStringFieldDataTests extends PagedBytesStringFieldDataTests { public static IndexFieldData hideOrdinals(final IndexFieldData in) { diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java b/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java index 516ba000da9..43c008c81dd 100644 --- a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.mapper.externalvalues; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.geo.ShapeRelation; import org.elasticsearch.common.geo.builders.ShapeBuilder; @@ -36,7 +35,6 @@ import static org.hamcrest.Matchers.equalTo; /** */ @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -@Slow public class ExternalValuesMapperIntegrationTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java b/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java index c57060c410a..890db5e3fdb 100644 --- a/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper.update; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; import org.elasticsearch.client.Client; @@ -41,7 +40,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -@Slow public class UpdateMappingOnClusterTests extends ElasticsearchIntegrationTest { private static final String INDEX = "index"; diff --git a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java index 924b6b28fb3..aedfec5fa58 100644 --- a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java +++ b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java @@ -33,7 +33,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.automaton.TooComplexToDeterminizeException; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchIllegalArgumentException; @@ -87,7 +86,6 @@ import static org.hamcrest.Matchers.*; /** * */ -@Slow public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest { private IndexQueryParserService queryParser; diff --git a/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java b/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java index 0dbc87f855f..dbc3f300b32 100644 --- a/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java +++ b/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.query; import com.google.common.collect.Maps; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.indexedscripts.delete.DeleteIndexedScriptResponse; import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptResponse; @@ -53,7 +52,6 @@ import static org.hamcrest.Matchers.is; * Full integration test of the template query plugin. */ @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -@Slow public class TemplateQueryTest extends ElasticsearchIntegrationTest { @Before diff --git a/src/test/java/org/elasticsearch/indexing/IndexActionTests.java b/src/test/java/org/elasticsearch/indexing/IndexActionTests.java index 2c9f3a01737..9201e1c381d 100644 --- a/src/test/java/org/elasticsearch/indexing/IndexActionTests.java +++ b/src/test/java/org/elasticsearch/indexing/IndexActionTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.indexing; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.index.IndexResponse; @@ -44,14 +43,13 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * */ -@Slow public class IndexActionTests extends ElasticsearchIntegrationTest { /** * This test tries to simulate load while creating an index and indexing documents * while the index is being created. */ - @Test + @Test @Slow public void testAutoGenerateIdNoDuplicates() throws Exception { int numberOfIterations = scaledRandomIntBetween(10, 50); for (int i = 0; i < numberOfIterations; i++) { diff --git a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java b/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java index daad846aca0..d5798aa94f1 100644 --- a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java +++ b/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.indices; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse; @@ -66,7 +65,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.*; -@Slow public class IndicesOptionsIntegrationTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java b/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java index 2dbd838de35..70ac71c132b 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java @@ -22,7 +22,6 @@ package org.elasticsearch.indices.mapping; import com.google.common.collect.Sets; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.index.IndexResponse; @@ -47,7 +46,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.hamcrest.Matchers.emptyIterable; @ElasticsearchIntegrationTest.ClusterScope(randomDynamicTemplates = false) // this test takes a long time to delete the idx if all fields are eager loading -@Slow public class ConcurrentDynamicTemplateTests extends ElasticsearchIntegrationTest { private final String mappingType = "test-mapping"; diff --git a/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java index 1ab4f7bace4..d225c936121 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.indices.mapping; import com.google.common.collect.Lists; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; @@ -54,7 +53,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThro import static org.hamcrest.Matchers.*; @ClusterScope(randomDynamicTemplates = false) -@Slow public class UpdateMappingTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java index 9d5917fd2bf..74776657270 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.indices.settings; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.count.CountResponse; @@ -36,7 +35,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; -@Slow public class UpdateNumberOfReplicasTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java b/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java index ed3294bf277..8b7d7932298 100644 --- a/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java +++ b/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.indices.state; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; @@ -49,7 +48,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFa import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -@Slow public class OpenCloseIndexTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java b/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java index 40db31a2121..b74eaf59d01 100644 --- a/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java +++ b/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.indices.store; import com.google.common.base.Predicate; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cluster.ClusterService; @@ -57,7 +56,6 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -@Slow public class IndicesStoreIntegrationTests extends ElasticsearchIntegrationTest { @Test @@ -177,7 +175,7 @@ public class IndicesStoreIntegrationTests extends ElasticsearchIntegrationTest { assertThat(waitForShardDeletion(node_4, "test", 0), equalTo(false)); } - @Test + @Test @Slow public void testShardActiveElseWhere() throws Exception { boolean node1IsMasterEligible = randomBoolean(); boolean node2IsMasterEligible = !node1IsMasterEligible || randomBoolean(); diff --git a/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java b/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java index 2160185b427..f3633555cf6 100644 --- a/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java +++ b/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.indices.store; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.store.IndexStoreModule; @@ -39,7 +38,6 @@ import static org.hamcrest.Matchers.*; /** * */ -@Slow public class SimpleDistributorTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java b/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java index 97b41cfcd5f..1530a35f713 100644 --- a/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java +++ b/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.mlt; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.index.IndexRequestBuilder; @@ -59,7 +58,6 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -@Slow public class MoreLikeThisActionTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java b/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java index 3c6e9b6e6ad..9815887f1d1 100644 --- a/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java +++ b/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.operateAllIndices; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.common.settings.ImmutableSettings; @@ -34,7 +33,6 @@ import static org.hamcrest.Matchers.equalTo; /** */ @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -@Slow public class DestructiveOperationsIntegrationTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java index 35d2dafc112..82e61defa12 100644 --- a/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.percolator; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.percolate.PercolateResponse; @@ -48,7 +47,6 @@ import static org.hamcrest.Matchers.*; /** * */ -@Slow public class ConcurrentPercolatorTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java b/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java index 4e720b85539..263af854883 100644 --- a/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java +++ b/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.percolator; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.percolate.PercolateRequestBuilder; import org.elasticsearch.action.percolate.PercolateResponse; import org.elasticsearch.index.query.QueryBuilder; @@ -45,7 +44,6 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -@Slow public class PercolatorFacetsAndAggregationsTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java index 4f1732e2be7..01c0eab4dee 100644 --- a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.percolator; import com.google.common.base.Predicate; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; @@ -106,7 +105,6 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -@Slow public class PercolatorTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java index 5d6aa9092ba..2cfd711787f 100644 --- a/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.percolator; import com.google.common.base.Predicate; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.percolate.PercolateResponse; @@ -48,7 +47,6 @@ import static org.hamcrest.Matchers.*; /** */ @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -@Slow public class TTLPercolatorTests extends ElasticsearchIntegrationTest { private static final long PURGE_INTERVAL = 200; diff --git a/src/test/java/org/elasticsearch/recovery/RelocationTests.java b/src/test/java/org/elasticsearch/recovery/RelocationTests.java index cf5d7125172..7ccd1387d93 100644 --- a/src/test/java/org/elasticsearch/recovery/RelocationTests.java +++ b/src/test/java/org/elasticsearch/recovery/RelocationTests.java @@ -91,7 +91,6 @@ import static org.hamcrest.Matchers.*; */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) @TestLogging("indices.recovery:TRACE,index.shard.service:TRACE") -@Slow public class RelocationTests extends ElasticsearchIntegrationTest { private final TimeValue ACCEPTABLE_RELOCATION_TIME = new TimeValue(5, TimeUnit.MINUTES); @@ -447,6 +446,7 @@ public class RelocationTests extends ElasticsearchIntegrationTest { } @Test + @Slow @TestLogging("cluster.service:TRACE,indices.recovery:TRACE") public void testRelocationWithBusyClusterUpdateThread() throws Exception { final String indexName = "test"; diff --git a/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java b/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java index 6adc7519c6f..610d5786a04 100644 --- a/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java +++ b/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.recovery; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.flush.FlushResponse; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.get.GetResponse; @@ -33,7 +32,6 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -@Slow public class SimpleRecoveryTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java b/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java index 2cd4e3fec31..7ddabae20fb 100644 --- a/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java +++ b/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java @@ -19,14 +19,12 @@ package org.elasticsearch.recovery; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; /** * */ -@Slow public class SmallTranslogOpsRecoveryTests extends SimpleRecoveryTests { @Override diff --git a/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java b/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java index bfe37274959..55b796acb4a 100644 --- a/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.routing; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.Version; import org.elasticsearch.action.RoutingMissingException; @@ -42,7 +41,6 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.hamcrest.Matchers.*; -@Slow public class SimpleRoutingTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java b/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java index d73b539aa62..76a9ff03e15 100644 --- a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java +++ b/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.script; import com.google.common.collect.ImmutableSet; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.common.inject.Module; import org.elasticsearch.common.settings.ImmutableSettings; @@ -36,7 +35,6 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.notNullValue; -@Slow public class CustomScriptContextTests extends ElasticsearchIntegrationTest { private static final ImmutableSet LANG_SET = ImmutableSet.of(GroovyScriptEngineService.NAME, MustacheScriptEngineService.NAME, ExpressionScriptEngineService.NAME); diff --git a/src/test/java/org/elasticsearch/script/IndexLookupTests.java b/src/test/java/org/elasticsearch/script/IndexLookupTests.java index 96e9052b8bf..85940106a35 100644 --- a/src/test/java/org/elasticsearch/script/IndexLookupTests.java +++ b/src/test/java/org/elasticsearch/script/IndexLookupTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.script; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.ShardSearchFailure; @@ -44,7 +43,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; -@Slow public class IndexLookupTests extends ElasticsearchIntegrationTest { String includeAllFlag = "_FREQUENCIES | _OFFSETS | _PAYLOADS | _POSITIONS | _CACHE"; diff --git a/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java b/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java index 770e0c31618..78a28520d4a 100644 --- a/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java +++ b/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.script; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -39,7 +38,6 @@ import static org.hamcrest.Matchers.equalTo; //Use Suite scope so that paths get set correctly @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -@Slow public class OnDiskScriptTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java b/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java index e7ee67ffd36..db8770a2207 100644 --- a/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java +++ b/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.script; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest; import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse; @@ -32,7 +31,6 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -@Slow public class ScriptIndexSettingsTest extends ElasticsearchIntegrationTest{ diff --git a/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java b/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java index 06ede6e7c65..2c19d957d8f 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java @@ -22,7 +22,6 @@ package org.elasticsearch.search.aggregations; import com.carrotsearch.hppc.IntIntMap; import com.carrotsearch.hppc.IntIntOpenHashMap; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; @@ -47,7 +46,6 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@Slow public class CombiTests extends ElasticsearchIntegrationTest { /** diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java index 7ec5a3ba192..91ed3d9eda2 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.update.UpdateResponse; @@ -50,7 +49,6 @@ import static org.hamcrest.Matchers.*; /** */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class ChildrenTests extends ElasticsearchIntegrationTest { private final static Map categoryToControl = new HashMap<>(); diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java index 2a46f7a9f17..aeba973a7da 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.bucket.filter.Filter; import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; @@ -33,7 +32,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -@Slow public class DedicatedAggregationTests extends ElasticsearchIntegrationTest { // https://github.com/elasticsearch/elasticsearch/issues/7240 diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java index fccdde0cf06..3c632b299b0 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -66,7 +65,6 @@ import static org.hamcrest.core.IsNull.notNullValue; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class DoubleTermsTests extends AbstractTermsTests { private static final int NUM_DOCS = 5; // TODO: randomize the size? diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java index 681877f87f8..eeb59a2c3fa 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -54,7 +53,6 @@ import static org.hamcrest.core.IsNull.notNullValue; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class FiltersTests extends ElasticsearchIntegrationTest { static int numDocs, numTag1Docs, numTag2Docs; diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java index 5f80e3300cc..58a50e8938a 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations.bucket; import com.carrotsearch.hppc.LongOpenHashSet; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.tools.ant.filters.TokenFilter.ContainsString; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchPhaseExecutionException; @@ -63,7 +62,6 @@ import static org.hamcrest.core.IsNull.notNullValue; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class HistogramTests extends ElasticsearchIntegrationTest { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java index 5b83f9b6518..f1cc2baef85 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.mapper.ip.IpFieldMapper; @@ -51,7 +50,6 @@ import static org.hamcrest.core.IsNull.nullValue; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class IPv4RangeTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java index 0d8ea12e55e..9cf7ce64d7d 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -64,7 +63,6 @@ import static org.hamcrest.core.IsNull.notNullValue; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class LongTermsTests extends AbstractTermsTests { private static final int NUM_DOCS = 5; // TODO randomize the size? diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java index 9af0d7ed711..bb1dc40a096 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java @@ -23,7 +23,6 @@ import com.carrotsearch.hppc.LongOpenHashSet; import com.carrotsearch.hppc.LongSet; import com.carrotsearch.randomizedtesting.generators.RandomStrings; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; @@ -55,7 +54,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllS @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class MinDocCountTests extends AbstractTermsTests { private static final QueryBuilder QUERY = QueryBuilders.termQuery("match", true); diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java index bb8537928e8..ac28cd4c8e4 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; @@ -68,7 +67,6 @@ import static org.hamcrest.core.IsNull.notNullValue; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class NestedTests extends ElasticsearchIntegrationTest { static int numParents; diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java index fe2c4929e68..b3ae0733dd1 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; @@ -35,7 +34,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -@Slow public class ParentIdAggTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java index 7f9e5c227c2..df449ea7c2a 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations.bucket; import com.google.common.collect.ImmutableMap; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.elasticsearch.search.aggregations.bucket.terms.Terms; @@ -33,7 +32,6 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.hamcrest.Matchers.equalTo; -@Slow public class ShardSizeTermsTests extends ShardSizeTests { @Test diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java index 63a0d21949a..14330a1f900 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.io.stream.StreamInput; @@ -65,7 +64,6 @@ import static org.hamcrest.Matchers.*; * */ @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -@Slow public class SignificantTermsSignificanceScoreTests extends ElasticsearchIntegrationTest { static final String INDEX_NAME = "testidx"; diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java index 88bd842bec9..3ef59e06a90 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations.bucket; import com.google.common.base.Strings; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -73,7 +72,6 @@ import static org.hamcrest.core.IsNull.nullValue; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class StringTermsTests extends AbstractTermsTests { private static final String SINGLE_VALUED_FIELD_NAME = "s_value"; diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java index a9bb66dafa5..e0fa33e89d4 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -48,7 +47,6 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.core.IsNull.notNullValue; @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class TermsDocCountErrorTests extends ElasticsearchIntegrationTest{ private static final String STRING_FIELD_NAME = "s_value"; diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java index 08f489b0a04..f75270f2ce7 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.FilterBuilders; @@ -44,7 +43,6 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -@Slow public class TermsShardMinDocCountTests extends ElasticsearchIntegrationTest { private static final String index = "someindex"; private static final String type = "testtype"; diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java b/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java index 1888f6c7b9a..f416b7df046 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.metrics; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.test.ElasticsearchIntegrationTest; @@ -31,7 +30,6 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public abstract class AbstractNumericTests extends ElasticsearchIntegrationTest { protected static long minValue, maxValue, minValues, maxValues; diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java b/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java index f6001cad21a..623143a167b 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.metrics; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; @@ -42,7 +41,6 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.notNullValue; @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class CardinalityTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java b/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java index 721c5903f17..cf25345aa93 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.metrics; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.geo.GeoPoint; @@ -60,7 +59,6 @@ import static org.hamcrest.Matchers.sameInstance; * */ @ElasticsearchIntegrationTest.SuiteScopeTest -@Slow public class GeoBoundsTests extends ElasticsearchIntegrationTest { private static final String SINGLE_VALUED_FIELD_NAME = "geo_value"; diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java b/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java index f30c4f499c4..89060a70ccf 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.metrics; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.bucket.global.Global; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; @@ -35,7 +34,6 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -@Slow public class SumTests extends AbstractNumericTests { @Override diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java index 1141284cca0..15b5c6440c6 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java @@ -22,7 +22,6 @@ package org.elasticsearch.search.basic; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.LeafReader; import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; @@ -52,7 +51,6 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; -@Slow public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java b/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java index 26ac35b10d5..2381cd2eea0 100644 --- a/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java +++ b/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.basic; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.common.unit.TimeValue; import com.google.common.base.Charsets; @@ -62,7 +61,6 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; -@Slow public class TransportTwoNodesSearchTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java index 247d4ced51e..deaf6e4d94f 100644 --- a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java +++ b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.child; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse; @@ -122,7 +121,6 @@ import static org.hamcrest.Matchers.startsWith; * */ @ClusterScope(scope = Scope.SUITE) -@Slow public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest { @Override @@ -1651,7 +1649,7 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest { } } - @Test + @Test @Slow // The SimpleIdReaderTypeCache#docById method used lget, which can't be used if a map is shared. public void testTopChildrenBug_concurrencyIssue() throws Exception { assertAcked(prepareCreate("test") diff --git a/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java b/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java index afc431d8512..a16acc1e8e8 100644 --- a/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java +++ b/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.compress; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; @@ -38,7 +37,6 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -@Slow public class SearchSourceCompressTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java index 2c3663824ba..59ff93d27d8 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.functionscore; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.ElasticsearchIllegalStateException; import org.elasticsearch.ElasticsearchParseException; @@ -57,7 +56,6 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -@Slow public class DecayFunctionScoreTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java index 43ad2c975c6..4ad41d9f44e 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.functionscore; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.functionscore.random.RandomScoreFunctionBuilder; import org.elasticsearch.search.SearchHit; @@ -38,9 +37,9 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; -@Slow public class RandomScoreFunctionTests extends ElasticsearchIntegrationTest { + @Slow public void testConsistentHitsWithSameSeed() throws Exception { createIndex("test"); ensureGreen(); // make sure we are done otherwise preference could change? diff --git a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java index 6f24d67121e..d663b95e92b 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.geo; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.cluster.ClusterState; @@ -53,7 +52,6 @@ import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -@Slow public class GeoShapeIntegrationTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java b/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java index 5b4c4b80cc4..7300331cab2 100644 --- a/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java +++ b/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.innerhits; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; @@ -47,7 +46,6 @@ import static org.hamcrest.Matchers.*; /** */ -@Slow public class InnerHitsTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java b/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java index fdaf8f58e5e..b420521eaaa 100644 --- a/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java +++ b/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.query; import com.google.common.collect.ImmutableMap; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.explain.ExplainResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -38,7 +37,6 @@ import java.util.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; -@Slow public class ExistsMissingTests extends ElasticsearchIntegrationTest { public void testExistsMissing() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java b/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java index a444497c6ce..66205a1b032 100644 --- a/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java +++ b/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.query; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.google.common.collect.Sets; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -52,7 +51,6 @@ import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -@Slow public class MultiMatchQueryTests extends ElasticsearchIntegrationTest { @Before diff --git a/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java b/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java index 1318aeeba0c..fc14abf27da 100644 --- a/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java +++ b/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.query; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.XContentFactory; @@ -43,7 +42,6 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for the {@code simple_query_string} query */ -@Slow public class SimpleQueryStringTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java index f71fae22761..81b10faed93 100644 --- a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java +++ b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java @@ -23,7 +23,6 @@ package org.elasticsearch.search.rescore; import org.apache.lucene.search.Explanation; import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -53,7 +52,6 @@ import static org.hamcrest.Matchers.*; /** * */ -@Slow public class QueryRescorerTests extends ElasticsearchIntegrationTest { @Test @@ -571,7 +569,7 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest { } } - @Test + @Test @Slow public void testScoring() throws Exception { int numDocs = indexRandomNumbers("keyword"); diff --git a/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java b/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java index 04d5465fdbf..7e0413757ee 100644 --- a/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.scriptfilter; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; @@ -44,7 +43,6 @@ import static org.hamcrest.Matchers.equalTo; * */ @ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE) -@Slow public class ScriptFilterSearchTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java index 92c3d5a16fa..b40e5547b1a 100644 --- a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java +++ b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java @@ -26,7 +26,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.index.IndexRequestBuilder; @@ -69,7 +68,6 @@ import static org.hamcrest.Matchers.*; /** * */ -@Slow public class SimpleSortTests extends ElasticsearchIntegrationTest { @TestLogging("action.search.type:TRACE") @@ -1024,7 +1022,7 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest { assertThat(searchResponse.getHits().getAt(2).id(), equalTo("3")); } - @Test + @Test @Slow public void testSortMissingStrings() throws ElasticsearchException, IOException { assertAcked(prepareCreate("test").addMapping("type1", XContentFactory.jsonBuilder() @@ -1056,6 +1054,7 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest { flush(); refresh(); + // TODO: WTF? try { Thread.sleep(2000); } catch (InterruptedException e) { diff --git a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java index 841f7f02d12..c67b82a1e0b 100644 --- a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java @@ -22,7 +22,6 @@ import com.carrotsearch.hppc.ObjectLongOpenHashMap; import com.carrotsearch.randomizedtesting.generators.RandomStrings; import com.google.common.collect.Lists; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse; @@ -69,7 +68,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful; import static org.hamcrest.Matchers.*; -@Slow public class CompletionSuggestSearchTests extends ElasticsearchIntegrationTest { private final String INDEX = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); diff --git a/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java index 3d76c23b8a8..6100bbc2682 100644 --- a/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.suggest; import com.google.common.collect.Sets; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.suggest.SuggestRequest; @@ -53,7 +52,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions.assertDistance; import static org.hamcrest.Matchers.containsString; -@Slow public class ContextSuggestSearchTests extends ElasticsearchIntegrationTest { private static final String INDEX = "test"; diff --git a/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java b/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java index 900b941663f..8f86ec572a0 100644 --- a/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java +++ b/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.snapshots; import com.carrotsearch.randomizedtesting.LifecycleScope; import com.google.common.collect.ImmutableList; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.repositories.delete.DeleteRepositoryResponse; import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesResponse; import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse; @@ -49,7 +48,6 @@ import static org.hamcrest.Matchers.notNullValue; /** */ -@Slow public class RepositoriesTests extends AbstractSnapshotTests { @Test diff --git a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index cf1fb94183f..e57732bf5f8 100644 --- a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -21,6 +21,7 @@ package org.elasticsearch.test.junit.listeners; import com.carrotsearch.randomizedtesting.RandomizedContext; import com.carrotsearch.randomizedtesting.ReproduceErrorMessageBuilder; import com.carrotsearch.randomizedtesting.TraceFormatting; + import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; diff --git a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java index de5977d95ed..2baf3706d44 100644 --- a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java +++ b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java @@ -27,6 +27,7 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import com.google.common.collect.Lists; import org.apache.lucene.util.LuceneTestCase.Slow; +import org.apache.lucene.util.LuceneTestCase.SuppressFsync; import org.apache.lucene.util.TimeUnits; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.PathUtils; @@ -70,6 +71,7 @@ import java.util.Set; */ @ElasticsearchRestTestCase.Rest @Slow +@SuppressFsync // we aren't trying to test this here, and it can make the test slow @ClusterScope(randomDynamicTemplates = false) @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) // timeout the suite after 40min and fail the test. public abstract class ElasticsearchRestTestCase extends ElasticsearchIntegrationTest { diff --git a/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java b/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java index 242ec585f12..bb6e4e976e1 100644 --- a/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java +++ b/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.test.test; import com.carrotsearch.randomizedtesting.annotations.Repeat; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.TestCluster; import org.junit.Test; @@ -34,7 +33,6 @@ import static org.hamcrest.Matchers.equalTo; * the tests random sequence due to initializtion using the same random instance. */ @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -@Slow public class SuiteScopeClusterTests extends ElasticsearchIntegrationTest { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; diff --git a/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java b/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java index ff2b24c0d11..310be735bde 100644 --- a/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java +++ b/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.test.test; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.TestCluster; import org.junit.Test; @@ -32,7 +31,6 @@ import static org.hamcrest.Matchers.equalTo; * the tests random sequence due to initializtion using the same random instance. */ @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -@Slow public class TestScopeClusterTests extends ElasticsearchIntegrationTest { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; diff --git a/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java b/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java index 7e5e9dc0354..8f105470969 100644 --- a/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java +++ b/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.timestamp; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; import org.elasticsearch.action.get.GetResponse; @@ -41,7 +40,6 @@ import static org.hamcrest.Matchers.notNullValue; /** */ -@Slow public class SimpleTimestampTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/update/UpdateTests.java b/src/test/java/org/elasticsearch/update/UpdateTests.java index 3192a3b88cc..8d58a9b763e 100644 --- a/src/test/java/org/elasticsearch/update/UpdateTests.java +++ b/src/test/java/org/elasticsearch/update/UpdateTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.update; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequestValidationException; @@ -57,7 +56,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.*; -@Slow public class UpdateTests extends ElasticsearchIntegrationTest { private void createTestIndex() throws Exception { diff --git a/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java b/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java index 2e3b9938a78..8ef7cfc2428 100644 --- a/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java +++ b/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.validate; import com.google.common.base.Charsets; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse; import org.elasticsearch.client.Client; @@ -61,7 +60,6 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(randomDynamicTemplates = false, scope = Scope.SUITE) -@Slow public class SimpleValidateQueryTests extends ElasticsearchIntegrationTest { static Boolean hasFilterCache;