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

Test fix - ensure forceMerged to single segment to avoid scoring variations in tests.

Browse Source 
Removed test muting.

Original commit: elastic/x-pack-elasticsearch@3a584aadda
This commit is contained in:
markharwood 2017-07-19 12:36:18 +01:00
parent 5e6c56bfc1
commit ffe6966ccd
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugin/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java
View File

@ -7,6 +7,9 @@ package org.elasticsearch.xpack.graph.test;
import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanQuery;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeResponse;
import org.elasticsearch.action.admin.indices.segments.IndexShardSegments;
import org.elasticsearch.action.admin.indices.segments.ShardSegments;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.Settings.Builder; import org.elasticsearch.common.settings.Settings.Builder;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
@ -36,6 +39,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;
@ -93,6 +97,18 @@ public class GraphTests extends XPackSingleNodeTestCase {
} }
} }
client().admin().indices().prepareRefresh("test").get(); client().admin().indices().prepareRefresh("test").get();
// Ensure single segment with no deletes. Hopefully solves test instability in
// issue https://github.com/elastic/x-pack-elasticsearch/issues/918
ForceMergeResponse actionGet = client().admin().indices().prepareForceMerge("test").setFlush(true).setMaxNumSegments(1)
.execute().actionGet();
assertAllSuccessful(actionGet);
for (IndexShardSegments seg : client().admin().indices().prepareSegments().get().getIndices().get("test")) {
ShardSegments[] shards = seg.getShards();
for (ShardSegments shardSegments : shards) {
assertEquals(1, shardSegments.getSegments().size());
}
}
assertHitCount(client().prepareSearch().setQuery(matchAllQuery()).get(), numDocs); assertHitCount(client().prepareSearch().setQuery(matchAllQuery()).get(), numDocs);
} }
@ -101,7 +117,6 @@ public class GraphTests extends XPackSingleNodeTestCase {
return pluginList(ScriptedTimeoutPlugin.class, XPackPlugin.class); return pluginList(ScriptedTimeoutPlugin.class, XPackPlugin.class);
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/issues/918")
public void testSignificanceQueryCrawl() { public void testSignificanceQueryCrawl() {
GraphExploreRequestBuilder grb = new GraphExploreRequestBuilder(client(), GraphExploreAction.INSTANCE).setIndices("test"); GraphExploreRequestBuilder grb = new GraphExploreRequestBuilder(client(), GraphExploreAction.INSTANCE).setIndices("test");
Hop hop1 = grb.createNextHop(QueryBuilders.termQuery("description", "beatles")); Hop hop1 = grb.createNextHop(QueryBuilders.termQuery("description", "beatles"));