From 6f3fc5d75d967f92ae908a1eeb028e0619741e2e Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Tue, 22 Dec 2015 15:09:44 +0100 Subject: [PATCH] Speed up CodecTests. Some tests, but in particular CodecTests, are slow because they test all versions that ever existed even though they should only test supported versions. --- .../routing/RoutingBackwardCompatibilityTests.java | 4 ++++ .../test/java/org/elasticsearch/codecs/CodecTests.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java index e8be4e34ae0..5ff4a328ef6 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java @@ -53,6 +53,10 @@ public class RoutingBackwardCompatibilityTests extends ESTestCase { OperationRouting operationRouting = new OperationRouting(Settings.EMPTY, null); for (Version version : VersionUtils.allVersions()) { + if (version.onOrAfter(Version.V_2_0_0) == false) { + // unsupported version, no need to test + continue; + } final Settings settings = settings(version).build(); IndexMetaData indexMetaData = IndexMetaData.builder(index).settings(settings).numberOfShards(numberOfShards).numberOfReplicas(randomInt(3)).build(); MetaData.Builder metaData = MetaData.builder().put(indexMetaData, false); diff --git a/core/src/test/java/org/elasticsearch/codecs/CodecTests.java b/core/src/test/java/org/elasticsearch/codecs/CodecTests.java index cffdcdc86eb..e5d27b872fb 100644 --- a/core/src/test/java/org/elasticsearch/codecs/CodecTests.java +++ b/core/src/test/java/org/elasticsearch/codecs/CodecTests.java @@ -44,6 +44,10 @@ public class CodecTests extends ESSingleNodeTestCase { .endObject().endObject().string(); int i = 0; for (Version v : VersionUtils.allVersions()) { + if (v.onOrAfter(Version.V_2_0_0) == false) { + // no need to test, we don't support upgrading from these versions + continue; + } IndexService indexService = createIndex("test-" + i++, Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, v).build()); DocumentMapperParser parser = indexService.mapperService().documentMapperParser(); try { @@ -67,6 +71,10 @@ public class CodecTests extends ESSingleNodeTestCase { .endObject().endObject().string(); int i = 0; for (Version v : VersionUtils.allVersions()) { + if (v.onOrAfter(Version.V_2_0_0) == false) { + // no need to test, we don't support upgrading from these versions + continue; + } IndexService indexService = createIndex("test-" + i++, Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, v).build()); DocumentMapperParser parser = indexService.mapperService().documentMapperParser(); try {