From f6d5f452cd45a7a84b7b3710a7f63a58157f4c9e Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Wed, 24 Jun 2020 13:38:39 +0200 Subject: [PATCH] Fix MultiClusterSearchYamlTestSuiteIT test failures (#58359) Restore number of shards for the field_caps_empty_index --- .../rest-api-spec/test/multi_cluster/10_basic.yml | 10 ++-------- .../rest-api-spec/test/multi_cluster/60_tophits.yml | 3 --- .../test/multi_cluster/70_skip_shards.yml | 3 --- .../test/multi_cluster/80_index_name_agg.yml | 3 --- .../test/multi_cluster/90_index_name_query.yml | 6 ------ .../rest-api-spec/test/remote_cluster/10_basic.yml | 6 ++++++ 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml index d5d9619fa0a..c9b8ab3397c 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml @@ -294,7 +294,7 @@ - match: { hits.total: 12 } --- -"Search an filtered alias on the remote cluster": +"Search a filtered alias on the remote cluster": - do: search: @@ -311,10 +311,7 @@ - match: { hits.hits.0._index: "my_remote_cluster:test_index" } --- -"Search an filtered alias and empty index on the remote cluster": - - skip: - version: "all" - reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/58345" +"Search a filtered alias and empty index on the remote cluster": - do: search: @@ -332,9 +329,6 @@ --- "Single shard search gets properly proxied": - - skip: - version: "all" - reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/58345" - do: search: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/60_tophits.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/60_tophits.yml index ad25ab18e2a..9d94e7d5abb 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/60_tophits.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/60_tophits.yml @@ -19,9 +19,6 @@ teardown: --- "Test that remote index names are preserved in top hits": - - skip: - version: "all" - reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/58345" - do: bulk: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/70_skip_shards.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/70_skip_shards.yml index 2c7399eefa6..92ae11c712b 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/70_skip_shards.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/70_skip_shards.yml @@ -1,8 +1,5 @@ --- "Test that remote indices are subject to shard skipping": - - skip: - version: "all" - reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/58345" - do: indices.create: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/80_index_name_agg.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/80_index_name_agg.yml index 7de5238ef18..9c4aa0e7f09 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/80_index_name_agg.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/80_index_name_agg.yml @@ -19,9 +19,6 @@ teardown: --- "Test that remote indices are maintained when we aggregate on _index": - - skip: - version: "all" - reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/58345" - do: bulk: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/90_index_name_query.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/90_index_name_query.yml index 0689834df72..a60a1b0d812 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/90_index_name_query.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/90_index_name_query.yml @@ -17,9 +17,6 @@ teardown: --- "Test that queries on _index match against the correct indices.": - - skip: - version: "all" - reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/58345" - do: bulk: @@ -62,9 +59,6 @@ teardown: --- "Test that queries on _index that don't match are skipped": - - skip: - version: "all" - reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/58345" - do: bulk: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml index ddf746de976..7f73272eb40 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml @@ -50,6 +50,7 @@ body: settings: index: + number_of_shards: 1 number_of_replicas: 0 mappings: properties: @@ -66,6 +67,11 @@ - do: indices.create: index: field_caps_empty_index + body: + settings: + index: + number_of_shards: 1 + number_of_replicas: 0 - do: indices.create: