From e98d5676b3ad96245f99945b8c174350a707aa16 Mon Sep 17 00:00:00 2001 From: jaymode Date: Mon, 5 Jun 2017 14:26:07 -0600 Subject: [PATCH] Test: update missing body tests to run against versions >= 5.5.0 This updates the missing body tests to run against versions >= 5.5.0 after backporting the change to the 5.x branch. See #23497 --- .../main/resources/rest-api-spec/test/bulk/10_basic.yml | 8 ++++---- .../rest-api-spec/test/cluster.put_script/10_basic.yml | 4 ++-- .../rest-api-spec/test/cluster.put_settings/10_basic.yml | 6 +++--- .../resources/rest-api-spec/test/index/10_with_id.yml | 4 ++-- .../rest-api-spec/test/indices.put_mapping/10_basic.yml | 4 ++-- .../rest-api-spec/test/indices.put_template/10_basic.yml | 4 ++-- .../resources/rest-api-spec/test/msearch/10_basic.yml | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml index 29a565ba0f7..2d9c37f20be 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml @@ -63,8 +63,8 @@ "missing body": - skip: - version: " - 5.99.99" - reason: NPE caused by missing body fixed in 6.0.0 + version: " - 5.4.99" + reason: NPE caused by missing body fixed in 5.5.0 - do: catch: /request body is required/ @@ -76,8 +76,8 @@ "empty action": - skip: - version: " - 5.99.99" - reason: confusing exception messaged caused by empty object fixed in 6.0.0 + version: " - 5.4.99" + reason: confusing exception messaged caused by empty object fixed in 5.5.0 - do: catch: /Malformed action\/metadata line \[3\], expected FIELD_NAME but found \[END_OBJECT\]/ diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_script/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_script/10_basic.yml index bfab22fd658..b0900667fe0 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_script/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_script/10_basic.yml @@ -2,8 +2,8 @@ "missing body": - skip: - version: " - 5.99.99" - reason: NPE caused by missing body fixed in 6.0.0 + version: " - 5.4.99" + reason: NPE caused by missing body fixed in 5.5.0 - do: catch: /request body is required/ diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml index 31f504a510c..e41f697807e 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml @@ -66,7 +66,7 @@ # this can't be bumped to 5.0.2 until snapshots are published - skip: - version: " - 5.99.99" + version: " - 5.0.3" reason: Fetching default group setting was buggy until 5.0.3 - do: @@ -79,8 +79,8 @@ "missing body": - skip: - version: " - 5.99.99" - reason: NPE caused by missing body fixed in 6.0.0 + version: " - 5.4.99" + reason: NPE caused by missing body fixed in 5.5.0 - do: catch: /request body is required/ diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml index b15aad5aaa1..c3d55952b1d 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml @@ -37,8 +37,8 @@ "missing body": - skip: - version: " - 5.99.99" - reason: NPE caused by missing body fixed in 6.0.0 + version: " - 5.4.99" + reason: NPE caused by missing body fixed in 5.5.0 - do: catch: /request body is required/ diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml index 10253fbcef7..d7831a55ac1 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml @@ -72,8 +72,8 @@ "missing body": - skip: - version: " - 5.99.99" - reason: NPE caused by missing body fixed in 6.0.0 + version: " - 5.4.99" + reason: NPE caused by missing body fixed in 5.5.0 - do: catch: /request body is required/ diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml index face649ea4e..baf00208bba 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml @@ -215,8 +215,8 @@ "missing body": - skip: - version: " - 5.99.99" - reason: NPE caused by missing body fixed in 6.0.0 + version: " - 5.4.99" + reason: NPE caused by missing body fixed in 5.5.0 - do: catch: /request body is required/ diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml index 5c78e6824ca..64268f19f8d 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml @@ -66,8 +66,8 @@ setup: "missing body": - skip: - version: " - 5.99.99" - reason: NPE caused by missing body fixed in 6.0.0 + version: " - 5.4.99" + reason: NPE caused by missing body fixed in 5.5.0 - do: catch: /request body or source parameter is required/