honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix backwards test to not muck with URIs or get mad about extra clusters

This commit is contained in:
Robert Muir 2015-04-17 19:41:55 -04:00
parent 43b6cd2118
commit 0ff0a0082d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityTest.java
View File

@ -39,7 +39,7 @@ public class StaticIndexBackwardCompatibilityTest extends ElasticsearchIntegrati
public void loadIndex(String index, Object... settings) throws Exception { public void loadIndex(String index, Object... settings) throws Exception {
logger.info("Checking static index " + index); logger.info("Checking static index " + index);
Settings nodeSettings = prepareBackwardsDataDir(Paths.get(getClass().getResource(index + ".zip").toURI()), settings); Settings nodeSettings = prepareBackwardsDataDir(getDataPath(index + ".zip"), settings);
internalCluster().startNode(nodeSettings); internalCluster().startNode(nodeSettings);
ensureGreen(index); ensureGreen(index);
assertIndexSanity(index); assertIndexSanity(index);

17
src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
View File

@ -76,7 +76,6 @@ import org.elasticsearch.common.Priority;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.io.FileSystemUtils;
import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.ImmutableSettings;
@ -99,7 +98,6 @@ import org.elasticsearch.index.fielddata.FieldDataType;
import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapper;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.FieldMapper.Loading; import org.elasticsearch.index.mapper.FieldMapper.Loading;
import org.elasticsearch.index.mapper.internal.AllFieldMapper;
import org.elasticsearch.index.mapper.internal.SizeFieldMapper; import org.elasticsearch.index.mapper.internal.SizeFieldMapper;
import org.elasticsearch.index.mapper.internal.SourceFieldMapper; import org.elasticsearch.index.mapper.internal.SourceFieldMapper;
import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper;
@ -148,7 +146,6 @@ import java.net.InetSocketAddress;
import java.nio.file.DirectoryStream; import java.nio.file.DirectoryStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -1925,7 +1922,19 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
TestUtil.unzip(stream, indexDir); TestUtil.unzip(stream, indexDir);
} }
assertTrue(Files.exists(dataDir)); assertTrue(Files.exists(dataDir));
Path[] list = FileSystemUtils.files(dataDir);
// list clusters in the datapath, ignoring anything from extrasfs
final Path[] list;
try (DirectoryStream<Path> stream = Files.newDirectoryStream(dataDir)) {
List<Path> dirs = new ArrayList<>();
for (Path p : stream) {
if (!p.getFileName().toString().startsWith("extra")) {
dirs.add(p);
}
}
list = dirs.toArray(new Path[0]);
}
if (list.length != 1) { if (list.length != 1) {
throw new IllegalStateException("Backwards index must contain exactly one cluster\n" + StringUtils.join(list, "\n")); throw new IllegalStateException("Backwards index must contain exactly one cluster\n" + StringUtils.join(list, "\n"));
} }