honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TEST] guarantee REST tests execution order

Browse Source 
REST tests are being shuffled before their execution. To guarantee their repeatability given the seed, their order needs to be always the same before the shuffling happens.

Closes #8745
This commit is contained in:
javanna 2014-12-02 19:07:17 +01:00 committed by Luca Cavanna
parent 3dfff84043
commit 36e12d39fd
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTests.java
View File

@ -49,9 +49,7 @@ import java.io.IOException;
import java.nio.file.FileSystems;
import java.nio.file.PathMatcher;
import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
/**
* Runs the clients test suite against an elasticsearch cluster.
@ -133,12 +131,10 @@ public class ElasticsearchRestTests extends ElasticsearchIntegrationTest {
String[] paths = resolvePathsProperty(REST_TESTS_SUITE, DEFAULT_TESTS_PATH);
Map<String, Set<File>> yamlSuites = FileUtils.findYamlSuites(DEFAULT_TESTS_PATH, paths);
//yaml suites are grouped by directory (effectively by api)
List<String> apis = Lists.newArrayList(yamlSuites.keySet());
List<RestTestCandidate> testCandidates = Lists.newArrayList();
RestTestSuiteParser restTestSuiteParser = new RestTestSuiteParser();
for (String api : apis) {
//yaml suites are grouped by directory (effectively by api)
for (String api : yamlSuites.keySet()) {
List<File> yamlFiles = Lists.newArrayList(yamlSuites.get(api));
for (File yamlFile : yamlFiles) {
//tests distribution disabled for now since it causes reporting problems,
@ -151,6 +147,15 @@ public class ElasticsearchRestTests extends ElasticsearchIntegrationTest {
//}
}
}
//sort the candidates so they will always be in the same order before being shuffled, for repeatability
Collections.sort(testCandidates, new Comparator<RestTestCandidate>() {
@Override
public int compare(RestTestCandidate o1, RestTestCandidate o2) {
return o1.getTestPath().compareTo(o2.getTestPath());
}
});
return testCandidates;
}