From ea6f0e39bc22a48e819e7d7864d96decb3cc30e7 Mon Sep 17 00:00:00 2001 From: Marios Trivyzas Date: Thu, 13 Feb 2020 15:36:31 +0100 Subject: [PATCH] [Tests] Update skip version for YAML tests (#52310) Update skip versions upper boundary to match the release or intented release version of the feature/fix. --- .../test/painless/85_script_score_random_score.yml | 4 ++-- .../resources/rest-api-spec/test/indices.open/10_basic.yml | 4 ++-- .../rest-api-spec/test/indices.validate_query/10_basic.yml | 4 ++-- .../rest-api-spec/test/search.aggregation/230_composite.yml | 2 +- .../rest-api-spec/test/search.aggregation/300_pipeline.yml | 4 ++-- .../rest-api-spec/test/search.aggregation/30_sig_terms.yml | 2 +- .../resources/rest-api-spec/test/snapshot.create/10_basic.yml | 4 ++-- .../resources/rest-api-spec/test/snapshot.get/10_basic.yml | 4 ++-- .../resources/rest-api-spec/test/indices.freeze/30_usage.yml | 4 ++-- .../rest-api-spec/test/voting_only_node/10_basic.yml | 4 ++-- .../rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/85_script_score_random_score.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/85_script_score_random_score.yml index d1f0e6ff125..d96b0ce42ec 100644 --- a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/85_script_score_random_score.yml +++ b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/85_script_score_random_score.yml @@ -2,8 +2,8 @@ setup: - skip: - version: " - 7.09.99" - reason: "random score function of script score was added in 7.1" + version: " - 7.1.99" + reason: "random score function of script score was added in 7.2" --- "Random score function with _seq_no field": diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml index 2ac37f6f49c..3d30f126cf6 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml @@ -85,8 +85,8 @@ --- "Close index response with result per index": - skip: - version: " - 7.99.99" - reason: "close index response reports result per index starting version 8.0.0" + version: " - 7.2.99" + reason: "close index response reports result per index starting version 7.3.0" - do: indices.create: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml index 88187aa201a..2221d08c0b7 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml @@ -13,8 +13,8 @@ setup: --- "Validate query api": - skip: - version: ' - 7.99.99' - reason: message changed in 8.0.0 + version: ' - 7.6.99' + reason: message changed in 7.7.0 - do: indices.validate_query: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml index 8d3f0899de3..d2378084f3b 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml @@ -775,7 +775,7 @@ setup: --- "Mixed ip and unmapped fields": - skip: - version: " - 7.99.99" + version: " - 7.5.99" reason: This will fail against 7.x until the fix is backported there # It is important that the index *without* the ip field be sorted *before* # the index *with* the ip field because that has caused bugs in the past. diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/300_pipeline.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/300_pipeline.yml index 0016c9f9894..2e3d796383a 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/300_pipeline.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/300_pipeline.yml @@ -1,7 +1,7 @@ setup: - skip: - version: " - 7.99.99" #TODO change this after backport - reason: These new error messages were added in 7.1 + version: " - 7.1.99" + reason: These new error messages were added in 7.2 - do: indices.create: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yml index 5204d65d333..dabd4aebf81 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yml @@ -141,7 +141,7 @@ --- 'Misspelled fields get "did you mean"': - skip: - version: " - 7.99.99" + version: " - 7.6.99" reason: Implemented in 8.0 (to be backported to 7.7) - do: catch: /\[significant_terms\] unknown field \[jlp\] did you mean \[jlh\]\?/ diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml index 6168c211383..fe70620c6ef 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml @@ -41,8 +41,8 @@ setup: --- "Create a snapshot and clean up repository": - skip: - version: " - 7.99.99" - reason: cleanup introduced in 8.0 + version: " - 7.3.99" + reason: cleanup introduced in 7.4 - do: snapshot.cleanup_repository: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml index 00656be2b59..874dda3606c 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml @@ -157,8 +157,8 @@ setup: --- "Get snapshot info with metadata": - skip: - version: " - 7.9.99" - reason: "https://github.com/elastic/elasticsearch/pull/41281 not yet backported to 7.x" + version: " - 7.2.99" + reason: "Introduced with 7.3" - do: indices.create: diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/30_usage.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/30_usage.yml index 9135c19f679..e254b2b49b9 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/30_usage.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/30_usage.yml @@ -10,8 +10,8 @@ setup: --- "Usage stats on frozen indices": - skip: - version: " - 7.9.99" - reason: "frozen indices have usage stats starting in version 8.0.0" + version: " - 7.3.99" + reason: "frozen indices have usage stats starting in version 7.4" - do: index: diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/voting_only_node/10_basic.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/voting_only_node/10_basic.yml index bba86b2ac0c..f7c4e97c036 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/voting_only_node/10_basic.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/voting_only_node/10_basic.yml @@ -2,8 +2,8 @@ "cluster stats with voting only node stats": - skip: - version: " - 7.99.99" - reason: "voting only nodes are added in v8.0.0" + version: " - 7.2.99" + reason: "voting only nodes are added in v7.3" - do: cluster.stats: {} diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml index b084cd8b0fc..c24318e0b19 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml @@ -123,8 +123,8 @@ setup: --- "Put job and datafeed with aggs in old cluster - deprecated interval with warning": - skip: - version: " - 7.99.99" #TODO change this after backport - reason: calendar_interval introduced in 7.1.0 + version: " - 7.1.99" + reason: calendar_interval introduced in 7.2.0 features: warnings - do: