From bdef1b7892f3fe19558f6d56b2059434e1b837ab Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Mon, 14 Oct 2019 11:28:15 +0300 Subject: [PATCH 1/4] Un-mute locale depending mapping tests (#47977) Reverts 71968c9. The underlying issue which was related to the bouncycastle security provider permissions was resolved in https://github.com/elastic/infra/pull/14995 resolves: https://github.com/elastic/elasticsearch/issues/39981 --- .../test/search/180_locale_dependent_mapping.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml index 0bd139a070bc2..e9ba863675dfa 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml @@ -1,8 +1,8 @@ --- "Test Index and Search locale dependent mappings / dates": - skip: - version: "all" - reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/39981(Previously: JDK9 only supports this with a special sysproperty added in 6.2.0.)" + version: " - 6.1.99" + reason: JDK9 only supports this with a special sysproperty added in 6.2.0 - do: indices.create: index: test_index From 98ec8784ded0fd82eead687a6e18cacfc1f63a32 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Tue, 15 Oct 2019 11:22:28 +0300 Subject: [PATCH 2/4] Change pattern to work with 6.8 --- .../rest-api-spec/test/search/180_locale_dependent_mapping.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml index e9ba863675dfa..90f966d1b2df3 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml @@ -13,7 +13,7 @@ properties: date_field: type: date - format: "E, d MMM yyyy HH:mm:ss Z" + format: "E, d MMM uuuu HH:mm:ss Z" locale: "de" - do: bulk: From a8bff1ee431e779ecfab8510a824e5e16e850adc Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Tue, 15 Oct 2019 12:37:26 +0300 Subject: [PATCH 3/4] properly fix pattern this time --- .../rest-api-spec/test/search/180_locale_dependent_mapping.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml index 90f966d1b2df3..00184b81f647a 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml @@ -13,7 +13,7 @@ properties: date_field: type: date - format: "E, d MMM uuuu HH:mm:ss Z" + format: "E, d MMM u HH:mm:ss Z" locale: "de" - do: bulk: From ec937d3940f3d27e3c62c2c8e320fd82c1c41929 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Wed, 16 Oct 2019 13:06:56 +0300 Subject: [PATCH 4/4] another try --- .../rest-api-spec/test/search/180_locale_dependent_mapping.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml index 00184b81f647a..ba059e10fb66f 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/180_locale_dependent_mapping.yml @@ -13,7 +13,7 @@ properties: date_field: type: date - format: "E, d MMM u HH:mm:ss Z" + format: "8E, d MMM uuuu HH:mm:ss Z" locale: "de" - do: bulk: