From 41ac1cd16c6056c5fd4c19133fb53ccc9633d75c Mon Sep 17 00:00:00 2001 From: Henning Andersen <33268011+henningandersen@users.noreply.github.com> Date: Fri, 14 Jun 2019 08:16:11 +0200 Subject: [PATCH] Fix versions for reindex max_docs tests (#42951) Versions were assuming this went into 7.2, but this ended up going into 7.3, updated test versions to reflect that. Related to #41894 --- .../test/delete_by_query/10_basic.yml | 18 +++++++++--------- .../test/delete_by_query/20_validation.yml | 8 ++++---- .../test/reindex/20_validation.yml | 16 ++++++++-------- .../rest-api-spec/test/reindex/30_search.yml | 18 +++++++++--------- .../rest-api-spec/test/reindex/90_remote.yml | 8 ++++---- .../test/update_by_query/10_basic.yml | 18 +++++++++--------- .../test/update_by_query/20_validation.yml | 16 ++++++++-------- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml index 522c2121a1c..3c52ce54200 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml @@ -286,8 +286,8 @@ --- "Limit by size": - skip: - version: " - 7.1.99" - reason: "deprecation warnings only emitted on 7.2+" + version: " - 7.2.99" + reason: "deprecation warnings only emitted on 7.3+" features: warnings - do: @@ -330,10 +330,10 @@ - match: {count: 1} --- -"Limit by size pre 7.2": +"Limit by size pre 7.3": - skip: - version: "7.2.0 - " - reason: "7.2 should use max_docs or get deprecation warning" + version: "7.3.0 - " + reason: "7.3 should use max_docs or get deprecation warning" - do: index: @@ -375,8 +375,8 @@ --- "Limit by max_docs in URL": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -418,8 +418,8 @@ --- "Limit by max_docs in body": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml index 2a59dd14fb7..2b1a9514aef 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml @@ -49,8 +49,8 @@ --- "invalid max_docs fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -69,8 +69,8 @@ --- "both max_docs and size fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml index e9b5ab7c129..2c58f122bfe 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml @@ -114,8 +114,8 @@ --- "invalid max_docs in body fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -135,8 +135,8 @@ --- "invalid max_docs in URL fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -156,8 +156,8 @@ --- "inconsistent max_docs and size fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -178,8 +178,8 @@ --- "inconsistent max_docs in body and max_docs in URL fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yml index 5a956127404..908ab55673c 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yml @@ -34,8 +34,8 @@ --- "Sorting and size combined": - skip: - version: " - 7.1.99" - reason: "deprecation warnings only emitted on 7.2+" + version: " - 7.2.99" + reason: "deprecation warnings only emitted on 7.3+" features: warnings - do: @@ -78,10 +78,10 @@ - match: { hits.total: 1 } --- -"Sorting and size combined pre 7.2": +"Sorting and size combined pre 7.3": - skip: - version: "7.2.0 - " - reason: "7.2 should use max_docs or get deprecation warning" + version: "7.3.0 - " + reason: "7.3 should use max_docs or get deprecation warning" - do: index: @@ -123,8 +123,8 @@ --- "Sorting and max_docs in body combined": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -166,8 +166,8 @@ --- "max_docs in URL": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yml index 744d7b1783c..dccf58a51b1 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yml @@ -220,8 +220,8 @@ --- "Reindex from remote with size": - skip: - version: "7.2.0 - " - reason: "7.2 should use max_docs or get deprecation warning" + version: "7.3.0 - " + reason: "7.3 should use max_docs or get deprecation warning" - do: index: @@ -286,8 +286,8 @@ --- "Reindex from remote with max_docs": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml index 3b63d1282cc..e220f164f26 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml @@ -223,8 +223,8 @@ --- "Limit by size": - skip: - version: " - 7.1.99" - reason: "deprecation warnings only emitted on 7.2+" + version: " - 7.2.99" + reason: "deprecation warnings only emitted on 7.3+" features: warnings - do: @@ -254,10 +254,10 @@ - gte: { took: 0 } --- -"Limit by size pre 7.2": +"Limit by size pre 7.3": - skip: - version: "7.2.0 - " - reason: "7.2 should use max_docs or get deprecation warning" + version: "7.3.0 - " + reason: "7.3 should use max_docs or get deprecation warning" - do: index: @@ -286,8 +286,8 @@ --- "Limit by max_docs in URL": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -316,8 +316,8 @@ --- "Limit by max_docs in body": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml index 45231473ea6..ddc09fe9d9a 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml @@ -27,8 +27,8 @@ --- "invalid max_docs in URL fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -44,8 +44,8 @@ --- "invalid max_docs in body fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -62,8 +62,8 @@ --- "inconsistent max_docs and size fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: @@ -83,8 +83,8 @@ --- "inconsistent max_docs in body and max_docs in URL fails": - skip: - version: " - 7.1.99" - reason: "max_docs introduced in 7.2.0" + version: " - 7.2.99" + reason: "max_docs introduced in 7.3.0" - do: index: