From 8f75c2b3a8a9f80273abea37c71e5db6b708d729 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 9 Sep 2015 15:42:26 -0700 Subject: [PATCH] Tests: Move static bwc indexes to a shared location There are a few tests that currently use the statically generated backcompat indexes. This change moves them to a shared location, so they no longer have to build a path based on the package name of the old index tests. --- .../bwcompat/OldIndexBackwardsCompatibilityIT.java | 2 +- .../bwcompat/RestoreBackwardsCompatIT.java | 4 ++-- .../common/util/MultiDataPathUpgraderTests.java | 2 +- .../index/engine/InternalEngineTests.java | 2 +- .../elasticsearch/index/translog/TranslogTests.java | 2 +- .../bwcompat => indices/bwc}/index-0.90.0.Beta1.zip | Bin .../bwcompat => indices/bwc}/index-0.90.0.RC1.zip | Bin .../bwcompat => indices/bwc}/index-0.90.0.RC2.zip | Bin .../bwcompat => indices/bwc}/index-0.90.0.zip | Bin .../bwcompat => indices/bwc}/index-0.90.1.zip | Bin .../bwcompat => indices/bwc}/index-0.90.10.zip | Bin .../bwcompat => indices/bwc}/index-0.90.11.zip | Bin .../bwcompat => indices/bwc}/index-0.90.12.zip | Bin .../bwcompat => indices/bwc}/index-0.90.13.zip | Bin .../bwcompat => indices/bwc}/index-0.90.2.zip | Bin .../bwcompat => indices/bwc}/index-0.90.3.zip | Bin .../bwcompat => indices/bwc}/index-0.90.4.zip | Bin .../bwcompat => indices/bwc}/index-0.90.5.zip | Bin .../bwcompat => indices/bwc}/index-0.90.6.zip | Bin .../bwcompat => indices/bwc}/index-0.90.7.zip | Bin .../bwcompat => indices/bwc}/index-0.90.8.zip | Bin .../bwcompat => indices/bwc}/index-0.90.9.zip | Bin .../bwcompat => indices/bwc}/index-1.0.0.Beta1.zip | Bin .../bwcompat => indices/bwc}/index-1.0.0.Beta2.zip | Bin .../bwcompat => indices/bwc}/index-1.0.0.RC1.zip | Bin .../bwcompat => indices/bwc}/index-1.0.0.RC2.zip | Bin .../bwcompat => indices/bwc}/index-1.0.0.zip | Bin .../bwcompat => indices/bwc}/index-1.0.1.zip | Bin .../bwcompat => indices/bwc}/index-1.0.2.zip | Bin .../bwcompat => indices/bwc}/index-1.0.3.zip | Bin .../bwcompat => indices/bwc}/index-1.1.0.zip | Bin .../bwcompat => indices/bwc}/index-1.1.1.zip | Bin .../bwcompat => indices/bwc}/index-1.1.2.zip | Bin .../bwcompat => indices/bwc}/index-1.2.0.zip | Bin .../bwcompat => indices/bwc}/index-1.2.1.zip | Bin .../bwcompat => indices/bwc}/index-1.2.2.zip | Bin .../bwcompat => indices/bwc}/index-1.2.3.zip | Bin .../bwcompat => indices/bwc}/index-1.2.4.zip | Bin .../bwcompat => indices/bwc}/index-1.3.0.zip | Bin .../bwcompat => indices/bwc}/index-1.3.1.zip | Bin .../bwcompat => indices/bwc}/index-1.3.2.zip | Bin .../bwcompat => indices/bwc}/index-1.3.3.zip | Bin .../bwcompat => indices/bwc}/index-1.3.4.zip | Bin .../bwcompat => indices/bwc}/index-1.3.5.zip | Bin .../bwcompat => indices/bwc}/index-1.3.6.zip | Bin .../bwcompat => indices/bwc}/index-1.3.7.zip | Bin .../bwcompat => indices/bwc}/index-1.3.8.zip | Bin .../bwcompat => indices/bwc}/index-1.3.9.zip | Bin .../bwcompat => indices/bwc}/index-1.4.0.Beta1.zip | Bin .../bwcompat => indices/bwc}/index-1.4.0.zip | Bin .../bwcompat => indices/bwc}/index-1.4.1.zip | Bin .../bwcompat => indices/bwc}/index-1.4.2.zip | Bin .../bwcompat => indices/bwc}/index-1.4.3.zip | Bin .../bwcompat => indices/bwc}/index-1.4.4.zip | Bin .../bwcompat => indices/bwc}/index-1.4.5.zip | Bin .../bwcompat => indices/bwc}/index-1.5.0.zip | Bin .../bwcompat => indices/bwc}/index-1.5.1.zip | Bin .../bwcompat => indices/bwc}/index-1.5.2.zip | Bin .../bwcompat => indices/bwc}/index-1.6.0.zip | Bin .../bwcompat => indices/bwc}/index-1.6.1.zip | Bin .../bwcompat => indices/bwc}/index-1.6.2.zip | Bin .../bwcompat => indices/bwc}/index-1.7.0.zip | Bin .../bwcompat => indices/bwc}/index-1.7.1.zip | Bin .../bwcompat => indices/bwc}/repo-1.0.0.Beta2.zip | Bin .../bwcompat => indices/bwc}/repo-1.0.0.RC1.zip | Bin .../bwcompat => indices/bwc}/repo-1.0.0.RC2.zip | Bin .../bwcompat => indices/bwc}/repo-1.0.0.zip | Bin .../bwcompat => indices/bwc}/repo-1.0.1.zip | Bin .../bwcompat => indices/bwc}/repo-1.0.2.zip | Bin .../bwcompat => indices/bwc}/repo-1.0.3.zip | Bin .../bwcompat => indices/bwc}/repo-1.1.0.zip | Bin .../bwcompat => indices/bwc}/repo-1.1.1.zip | Bin .../bwcompat => indices/bwc}/repo-1.1.2.zip | Bin .../bwcompat => indices/bwc}/repo-1.2.0.zip | Bin .../bwcompat => indices/bwc}/repo-1.2.1.zip | Bin .../bwcompat => indices/bwc}/repo-1.2.2.zip | Bin .../bwcompat => indices/bwc}/repo-1.2.3.zip | Bin .../bwcompat => indices/bwc}/repo-1.2.4.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.0.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.1.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.2.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.3.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.4.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.5.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.6.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.7.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.8.zip | Bin .../bwcompat => indices/bwc}/repo-1.3.9.zip | Bin .../bwcompat => indices/bwc}/repo-1.4.0.Beta1.zip | Bin .../bwcompat => indices/bwc}/repo-1.4.0.zip | Bin .../bwcompat => indices/bwc}/repo-1.4.1.zip | Bin .../bwcompat => indices/bwc}/repo-1.4.2.zip | Bin .../bwcompat => indices/bwc}/repo-1.4.3.zip | Bin .../bwcompat => indices/bwc}/repo-1.4.4.zip | Bin .../bwcompat => indices/bwc}/repo-1.4.5.zip | Bin .../bwcompat => indices/bwc}/repo-1.5.0.zip | Bin .../bwcompat => indices/bwc}/repo-1.5.1.zip | Bin .../bwcompat => indices/bwc}/repo-1.5.2.zip | Bin .../bwcompat => indices/bwc}/repo-1.6.0.zip | Bin .../bwcompat => indices/bwc}/repo-1.6.1.zip | Bin .../bwcompat => indices/bwc}/repo-1.6.2.zip | Bin .../bwcompat => indices/bwc}/repo-1.7.0.zip | Bin .../bwcompat => indices/bwc}/repo-1.7.1.zip | Bin .../bwcompat => indices/bwc}/unsupported-0.20.6.zip | Bin .../bwc}/unsupportedrepo-0.20.6.zip | Bin dev-tools/create_bwc_index.py | 2 +- dev-tools/create_bwc_repo_with_ancient_indices.py | 2 +- 107 files changed, 8 insertions(+), 8 deletions(-) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.0.Beta1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.0.RC1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.0.RC2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.10.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.11.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.12.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.13.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.4.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.5.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.6.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.7.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.8.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-0.90.9.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.0.0.Beta1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.0.0.Beta2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.0.0.RC1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.0.0.RC2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.0.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.0.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.0.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.0.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.1.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.1.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.1.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.2.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.2.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.2.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.2.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.2.4.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.4.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.5.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.6.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.7.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.8.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.3.9.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.4.0.Beta1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.4.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.4.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.4.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.4.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.4.4.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.4.5.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.5.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.5.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.5.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.6.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.6.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.6.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.7.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/index-1.7.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.0.0.Beta2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.0.0.RC1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.0.0.RC2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.0.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.0.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.0.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.0.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.1.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.1.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.1.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.2.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.2.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.2.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.2.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.2.4.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.4.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.5.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.6.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.7.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.8.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.3.9.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.4.0.Beta1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.4.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.4.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.4.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.4.3.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.4.4.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.4.5.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.5.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.5.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.5.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.6.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.6.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.6.2.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.7.0.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/repo-1.7.1.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/unsupported-0.20.6.zip (100%) rename core/src/test/resources/{org/elasticsearch/bwcompat => indices/bwc}/unsupportedrepo-0.20.6.zip (100%) diff --git a/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java index cca46cfa98c..94a285e0696 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java @@ -98,7 +98,7 @@ public class OldIndexBackwardsCompatibilityIT extends ESIntegTestCase { private List loadIndexesList(String prefix) throws IOException { List indexes = new ArrayList<>(); - Path dir = getDataPath("."); + Path dir = getDataPath("/indices/bwc"); try (DirectoryStream stream = Files.newDirectoryStream(dir, prefix + "-*.zip")) { for (Path path : stream) { indexes.add(path.getFileName().toString()); diff --git a/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java b/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java index 14bcfc79076..f47c9dfb103 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java @@ -129,7 +129,7 @@ public class RestoreBackwardsCompatIT extends AbstractSnapshotIntegTestCase { } private Path reposRoot() { - return getDataPath("."); + return getDataPath("/indices/bwc"); } private List repoVersions() throws Exception { @@ -155,7 +155,7 @@ public class RestoreBackwardsCompatIT extends AbstractSnapshotIntegTestCase { } private void createRepo(String prefix, String version, String repo) throws Exception { - String repoFile = prefix + "-" + version + ".zip"; + String repoFile = "/indices/bwc/" + prefix + "-" + version + ".zip"; URI repoFileUri = getDataPath(repoFile).toUri(); URI repoJarUri = new URI("jar:" + repoFileUri.toString() + "!/repo/"); logger.info("--> creating repository [{}] for version [{}]", repo, version); diff --git a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java index fe3051b4111..c46bb4777d0 100644 --- a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java @@ -133,7 +133,7 @@ public class MultiDataPathUpgraderTests extends ESTestCase { */ public void testUpgradeRealIndex() throws IOException, URISyntaxException { List indexes = new ArrayList<>(); - Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test + Path dir = getDataPath("/indices/bwc"); try (DirectoryStream stream = Files.newDirectoryStream(dir, "index-*.zip")) { for (Path path : stream) { indexes.add(path); diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 5a1efd1bfbb..bba853c27ab 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -1786,7 +1786,7 @@ public class InternalEngineTests extends ESTestCase { public void testUpgradeOldIndex() throws IOException { List indexes = new ArrayList<>(); - Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test + Path dir = getDataPath("/indices/bwc"); try (DirectoryStream stream = Files.newDirectoryStream(dir, "index-*.zip")) { for (Path path : stream) { indexes.add(path); diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java index 5d153c70524..c834cc84a58 100644 --- a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java +++ b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java @@ -1157,7 +1157,7 @@ public class TranslogTests extends ESTestCase { public void testUpgradeOldTranslogFiles() throws IOException { List indexes = new ArrayList<>(); - Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test + Path dir = getDataPath("/indices/bwc"); try (DirectoryStream stream = Files.newDirectoryStream(dir, "index-*.zip")) { for (Path path : stream) { indexes.add(path); diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.Beta1.zip b/core/src/test/resources/indices/bwc/index-0.90.0.Beta1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.Beta1.zip rename to core/src/test/resources/indices/bwc/index-0.90.0.Beta1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC1.zip b/core/src/test/resources/indices/bwc/index-0.90.0.RC1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC1.zip rename to core/src/test/resources/indices/bwc/index-0.90.0.RC1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC2.zip b/core/src/test/resources/indices/bwc/index-0.90.0.RC2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC2.zip rename to core/src/test/resources/indices/bwc/index-0.90.0.RC2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.zip b/core/src/test/resources/indices/bwc/index-0.90.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.zip rename to core/src/test/resources/indices/bwc/index-0.90.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.1.zip b/core/src/test/resources/indices/bwc/index-0.90.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.1.zip rename to core/src/test/resources/indices/bwc/index-0.90.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.10.zip b/core/src/test/resources/indices/bwc/index-0.90.10.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.10.zip rename to core/src/test/resources/indices/bwc/index-0.90.10.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.11.zip b/core/src/test/resources/indices/bwc/index-0.90.11.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.11.zip rename to core/src/test/resources/indices/bwc/index-0.90.11.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.12.zip b/core/src/test/resources/indices/bwc/index-0.90.12.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.12.zip rename to core/src/test/resources/indices/bwc/index-0.90.12.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.13.zip b/core/src/test/resources/indices/bwc/index-0.90.13.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.13.zip rename to core/src/test/resources/indices/bwc/index-0.90.13.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.2.zip b/core/src/test/resources/indices/bwc/index-0.90.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.2.zip rename to core/src/test/resources/indices/bwc/index-0.90.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.3.zip b/core/src/test/resources/indices/bwc/index-0.90.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.3.zip rename to core/src/test/resources/indices/bwc/index-0.90.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.4.zip b/core/src/test/resources/indices/bwc/index-0.90.4.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.4.zip rename to core/src/test/resources/indices/bwc/index-0.90.4.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.5.zip b/core/src/test/resources/indices/bwc/index-0.90.5.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.5.zip rename to core/src/test/resources/indices/bwc/index-0.90.5.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.6.zip b/core/src/test/resources/indices/bwc/index-0.90.6.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.6.zip rename to core/src/test/resources/indices/bwc/index-0.90.6.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.7.zip b/core/src/test/resources/indices/bwc/index-0.90.7.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.7.zip rename to core/src/test/resources/indices/bwc/index-0.90.7.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.8.zip b/core/src/test/resources/indices/bwc/index-0.90.8.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.8.zip rename to core/src/test/resources/indices/bwc/index-0.90.8.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.9.zip b/core/src/test/resources/indices/bwc/index-0.90.9.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.9.zip rename to core/src/test/resources/indices/bwc/index-0.90.9.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta1.zip b/core/src/test/resources/indices/bwc/index-1.0.0.Beta1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta1.zip rename to core/src/test/resources/indices/bwc/index-1.0.0.Beta1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta2.zip b/core/src/test/resources/indices/bwc/index-1.0.0.Beta2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta2.zip rename to core/src/test/resources/indices/bwc/index-1.0.0.Beta2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC1.zip b/core/src/test/resources/indices/bwc/index-1.0.0.RC1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC1.zip rename to core/src/test/resources/indices/bwc/index-1.0.0.RC1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC2.zip b/core/src/test/resources/indices/bwc/index-1.0.0.RC2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC2.zip rename to core/src/test/resources/indices/bwc/index-1.0.0.RC2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.zip b/core/src/test/resources/indices/bwc/index-1.0.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.zip rename to core/src/test/resources/indices/bwc/index-1.0.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.1.zip b/core/src/test/resources/indices/bwc/index-1.0.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.1.zip rename to core/src/test/resources/indices/bwc/index-1.0.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.2.zip b/core/src/test/resources/indices/bwc/index-1.0.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.2.zip rename to core/src/test/resources/indices/bwc/index-1.0.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.3.zip b/core/src/test/resources/indices/bwc/index-1.0.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.3.zip rename to core/src/test/resources/indices/bwc/index-1.0.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.0.zip b/core/src/test/resources/indices/bwc/index-1.1.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.0.zip rename to core/src/test/resources/indices/bwc/index-1.1.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.1.zip b/core/src/test/resources/indices/bwc/index-1.1.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.1.zip rename to core/src/test/resources/indices/bwc/index-1.1.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.2.zip b/core/src/test/resources/indices/bwc/index-1.1.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.2.zip rename to core/src/test/resources/indices/bwc/index-1.1.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.0.zip b/core/src/test/resources/indices/bwc/index-1.2.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.0.zip rename to core/src/test/resources/indices/bwc/index-1.2.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.1.zip b/core/src/test/resources/indices/bwc/index-1.2.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.1.zip rename to core/src/test/resources/indices/bwc/index-1.2.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.2.zip b/core/src/test/resources/indices/bwc/index-1.2.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.2.zip rename to core/src/test/resources/indices/bwc/index-1.2.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.3.zip b/core/src/test/resources/indices/bwc/index-1.2.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.3.zip rename to core/src/test/resources/indices/bwc/index-1.2.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.4.zip b/core/src/test/resources/indices/bwc/index-1.2.4.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.4.zip rename to core/src/test/resources/indices/bwc/index-1.2.4.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.0.zip b/core/src/test/resources/indices/bwc/index-1.3.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.0.zip rename to core/src/test/resources/indices/bwc/index-1.3.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.1.zip b/core/src/test/resources/indices/bwc/index-1.3.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.1.zip rename to core/src/test/resources/indices/bwc/index-1.3.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.2.zip b/core/src/test/resources/indices/bwc/index-1.3.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.2.zip rename to core/src/test/resources/indices/bwc/index-1.3.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.3.zip b/core/src/test/resources/indices/bwc/index-1.3.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.3.zip rename to core/src/test/resources/indices/bwc/index-1.3.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.4.zip b/core/src/test/resources/indices/bwc/index-1.3.4.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.4.zip rename to core/src/test/resources/indices/bwc/index-1.3.4.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.5.zip b/core/src/test/resources/indices/bwc/index-1.3.5.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.5.zip rename to core/src/test/resources/indices/bwc/index-1.3.5.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.6.zip b/core/src/test/resources/indices/bwc/index-1.3.6.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.6.zip rename to core/src/test/resources/indices/bwc/index-1.3.6.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.7.zip b/core/src/test/resources/indices/bwc/index-1.3.7.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.7.zip rename to core/src/test/resources/indices/bwc/index-1.3.7.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.8.zip b/core/src/test/resources/indices/bwc/index-1.3.8.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.8.zip rename to core/src/test/resources/indices/bwc/index-1.3.8.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.9.zip b/core/src/test/resources/indices/bwc/index-1.3.9.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.9.zip rename to core/src/test/resources/indices/bwc/index-1.3.9.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.Beta1.zip b/core/src/test/resources/indices/bwc/index-1.4.0.Beta1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.Beta1.zip rename to core/src/test/resources/indices/bwc/index-1.4.0.Beta1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.zip b/core/src/test/resources/indices/bwc/index-1.4.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.zip rename to core/src/test/resources/indices/bwc/index-1.4.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.1.zip b/core/src/test/resources/indices/bwc/index-1.4.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.1.zip rename to core/src/test/resources/indices/bwc/index-1.4.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.2.zip b/core/src/test/resources/indices/bwc/index-1.4.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.2.zip rename to core/src/test/resources/indices/bwc/index-1.4.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.3.zip b/core/src/test/resources/indices/bwc/index-1.4.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.3.zip rename to core/src/test/resources/indices/bwc/index-1.4.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.4.zip b/core/src/test/resources/indices/bwc/index-1.4.4.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.4.zip rename to core/src/test/resources/indices/bwc/index-1.4.4.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.5.zip b/core/src/test/resources/indices/bwc/index-1.4.5.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.5.zip rename to core/src/test/resources/indices/bwc/index-1.4.5.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.0.zip b/core/src/test/resources/indices/bwc/index-1.5.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.0.zip rename to core/src/test/resources/indices/bwc/index-1.5.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.1.zip b/core/src/test/resources/indices/bwc/index-1.5.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.1.zip rename to core/src/test/resources/indices/bwc/index-1.5.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.2.zip b/core/src/test/resources/indices/bwc/index-1.5.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.2.zip rename to core/src/test/resources/indices/bwc/index-1.5.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.0.zip b/core/src/test/resources/indices/bwc/index-1.6.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.0.zip rename to core/src/test/resources/indices/bwc/index-1.6.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.1.zip b/core/src/test/resources/indices/bwc/index-1.6.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.1.zip rename to core/src/test/resources/indices/bwc/index-1.6.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.2.zip b/core/src/test/resources/indices/bwc/index-1.6.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.2.zip rename to core/src/test/resources/indices/bwc/index-1.6.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.7.0.zip b/core/src/test/resources/indices/bwc/index-1.7.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.7.0.zip rename to core/src/test/resources/indices/bwc/index-1.7.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.7.1.zip b/core/src/test/resources/indices/bwc/index-1.7.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.7.1.zip rename to core/src/test/resources/indices/bwc/index-1.7.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.Beta2.zip b/core/src/test/resources/indices/bwc/repo-1.0.0.Beta2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.Beta2.zip rename to core/src/test/resources/indices/bwc/repo-1.0.0.Beta2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC1.zip b/core/src/test/resources/indices/bwc/repo-1.0.0.RC1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC1.zip rename to core/src/test/resources/indices/bwc/repo-1.0.0.RC1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC2.zip b/core/src/test/resources/indices/bwc/repo-1.0.0.RC2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC2.zip rename to core/src/test/resources/indices/bwc/repo-1.0.0.RC2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.zip b/core/src/test/resources/indices/bwc/repo-1.0.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.zip rename to core/src/test/resources/indices/bwc/repo-1.0.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.1.zip b/core/src/test/resources/indices/bwc/repo-1.0.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.1.zip rename to core/src/test/resources/indices/bwc/repo-1.0.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.2.zip b/core/src/test/resources/indices/bwc/repo-1.0.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.2.zip rename to core/src/test/resources/indices/bwc/repo-1.0.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.3.zip b/core/src/test/resources/indices/bwc/repo-1.0.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.3.zip rename to core/src/test/resources/indices/bwc/repo-1.0.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.0.zip b/core/src/test/resources/indices/bwc/repo-1.1.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.0.zip rename to core/src/test/resources/indices/bwc/repo-1.1.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.1.zip b/core/src/test/resources/indices/bwc/repo-1.1.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.1.zip rename to core/src/test/resources/indices/bwc/repo-1.1.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.2.zip b/core/src/test/resources/indices/bwc/repo-1.1.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.2.zip rename to core/src/test/resources/indices/bwc/repo-1.1.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.0.zip b/core/src/test/resources/indices/bwc/repo-1.2.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.0.zip rename to core/src/test/resources/indices/bwc/repo-1.2.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.1.zip b/core/src/test/resources/indices/bwc/repo-1.2.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.1.zip rename to core/src/test/resources/indices/bwc/repo-1.2.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.2.zip b/core/src/test/resources/indices/bwc/repo-1.2.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.2.zip rename to core/src/test/resources/indices/bwc/repo-1.2.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.3.zip b/core/src/test/resources/indices/bwc/repo-1.2.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.3.zip rename to core/src/test/resources/indices/bwc/repo-1.2.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.4.zip b/core/src/test/resources/indices/bwc/repo-1.2.4.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.4.zip rename to core/src/test/resources/indices/bwc/repo-1.2.4.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.0.zip b/core/src/test/resources/indices/bwc/repo-1.3.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.0.zip rename to core/src/test/resources/indices/bwc/repo-1.3.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.1.zip b/core/src/test/resources/indices/bwc/repo-1.3.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.1.zip rename to core/src/test/resources/indices/bwc/repo-1.3.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.2.zip b/core/src/test/resources/indices/bwc/repo-1.3.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.2.zip rename to core/src/test/resources/indices/bwc/repo-1.3.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.3.zip b/core/src/test/resources/indices/bwc/repo-1.3.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.3.zip rename to core/src/test/resources/indices/bwc/repo-1.3.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.4.zip b/core/src/test/resources/indices/bwc/repo-1.3.4.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.4.zip rename to core/src/test/resources/indices/bwc/repo-1.3.4.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.5.zip b/core/src/test/resources/indices/bwc/repo-1.3.5.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.5.zip rename to core/src/test/resources/indices/bwc/repo-1.3.5.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.6.zip b/core/src/test/resources/indices/bwc/repo-1.3.6.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.6.zip rename to core/src/test/resources/indices/bwc/repo-1.3.6.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.7.zip b/core/src/test/resources/indices/bwc/repo-1.3.7.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.7.zip rename to core/src/test/resources/indices/bwc/repo-1.3.7.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.8.zip b/core/src/test/resources/indices/bwc/repo-1.3.8.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.8.zip rename to core/src/test/resources/indices/bwc/repo-1.3.8.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.9.zip b/core/src/test/resources/indices/bwc/repo-1.3.9.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.9.zip rename to core/src/test/resources/indices/bwc/repo-1.3.9.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.Beta1.zip b/core/src/test/resources/indices/bwc/repo-1.4.0.Beta1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.Beta1.zip rename to core/src/test/resources/indices/bwc/repo-1.4.0.Beta1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.zip b/core/src/test/resources/indices/bwc/repo-1.4.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.zip rename to core/src/test/resources/indices/bwc/repo-1.4.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.1.zip b/core/src/test/resources/indices/bwc/repo-1.4.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.1.zip rename to core/src/test/resources/indices/bwc/repo-1.4.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.2.zip b/core/src/test/resources/indices/bwc/repo-1.4.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.2.zip rename to core/src/test/resources/indices/bwc/repo-1.4.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.3.zip b/core/src/test/resources/indices/bwc/repo-1.4.3.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.3.zip rename to core/src/test/resources/indices/bwc/repo-1.4.3.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.4.zip b/core/src/test/resources/indices/bwc/repo-1.4.4.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.4.zip rename to core/src/test/resources/indices/bwc/repo-1.4.4.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.5.zip b/core/src/test/resources/indices/bwc/repo-1.4.5.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.5.zip rename to core/src/test/resources/indices/bwc/repo-1.4.5.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.0.zip b/core/src/test/resources/indices/bwc/repo-1.5.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.0.zip rename to core/src/test/resources/indices/bwc/repo-1.5.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.1.zip b/core/src/test/resources/indices/bwc/repo-1.5.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.1.zip rename to core/src/test/resources/indices/bwc/repo-1.5.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.2.zip b/core/src/test/resources/indices/bwc/repo-1.5.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.2.zip rename to core/src/test/resources/indices/bwc/repo-1.5.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.0.zip b/core/src/test/resources/indices/bwc/repo-1.6.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.0.zip rename to core/src/test/resources/indices/bwc/repo-1.6.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.1.zip b/core/src/test/resources/indices/bwc/repo-1.6.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.1.zip rename to core/src/test/resources/indices/bwc/repo-1.6.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.2.zip b/core/src/test/resources/indices/bwc/repo-1.6.2.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.2.zip rename to core/src/test/resources/indices/bwc/repo-1.6.2.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.7.0.zip b/core/src/test/resources/indices/bwc/repo-1.7.0.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.7.0.zip rename to core/src/test/resources/indices/bwc/repo-1.7.0.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.7.1.zip b/core/src/test/resources/indices/bwc/repo-1.7.1.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.7.1.zip rename to core/src/test/resources/indices/bwc/repo-1.7.1.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/unsupported-0.20.6.zip b/core/src/test/resources/indices/bwc/unsupported-0.20.6.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/unsupported-0.20.6.zip rename to core/src/test/resources/indices/bwc/unsupported-0.20.6.zip diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/unsupportedrepo-0.20.6.zip b/core/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/bwcompat/unsupportedrepo-0.20.6.zip rename to core/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip diff --git a/dev-tools/create_bwc_index.py b/dev-tools/create_bwc_index.py index 22ba7f78ce5..d780b2af5e2 100644 --- a/dev-tools/create_bwc_index.py +++ b/dev-tools/create_bwc_index.py @@ -333,7 +333,7 @@ def parse_config(): help='Recreate all existing backwards compatibility indexes') parser.add_argument('--releases-dir', '-d', default='backwards', metavar='DIR', help='The directory containing elasticsearch releases') - parser.add_argument('--output-dir', '-o', default='core/src/test/resources/org/elasticsearch/bwcompat', + parser.add_argument('--output-dir', '-o', default='core/src/test/resources/indices/bwc', help='The directory to write the zipped index into') parser.add_argument('--tcp-port', default=DEFAULT_TRANSPORT_TCP_PORT, type=int, help='The port to use as the minimum port for TCP communication') diff --git a/dev-tools/create_bwc_repo_with_ancient_indices.py b/dev-tools/create_bwc_repo_with_ancient_indices.py index 27d166d2b6a..5c6b8222b02 100644 --- a/dev-tools/create_bwc_repo_with_ancient_indices.py +++ b/dev-tools/create_bwc_repo_with_ancient_indices.py @@ -63,7 +63,7 @@ def main(): create_bwc_index.shutdown_node(node) print('%s server output:\n%s' % (second_version, node.stdout.read().decode('utf-8'))) - create_bwc_index.compress(tmp_dir, "src/test/resources/org/elasticsearch/bwcompat", 'unsupportedrepo-%s.zip' % first_version, 'repo') + create_bwc_index.compress(tmp_dir, "src/test/resources/indices/bwc", 'unsupportedrepo-%s.zip' % first_version, 'repo') node = None finally: