From afb463042e2ec75fc365b20baa783b035753eae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Sat, 2 Feb 2019 20:09:53 +0100 Subject: [PATCH 1/3] Mute DateProcessorTests#testJodaPatternLocale Only fails on FIPS 8 but we cannot mute this selectively. --- .../org/elasticsearch/ingest/common/DateProcessorTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java index c9ab07d82bbcc..321ddb39a3295 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java @@ -112,6 +112,8 @@ public void testInvalidJavaPattern() { } } + // this fails only on FIPS 140 JVM but we cannot mute selectively + @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/31724") public void testJavaPatternLocale() { DateProcessor dateProcessor = new DateProcessor(randomAlphaOfLength(10), templatize(ZoneId.of("Europe/Amsterdam")), templatize(Locale.ITALIAN), From 9f36b28865ca8b64ee92d1ed7912ac3cefe71085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Sun, 3 Feb 2019 19:29:46 +0100 Subject: [PATCH 2/3] Update DateProcessorTests.java --- .../org/elasticsearch/ingest/common/DateProcessorTests.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java index 321ddb39a3295..1ab1f617d9905 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java @@ -112,9 +112,8 @@ public void testInvalidJavaPattern() { } } - // this fails only on FIPS 140 JVM but we cannot mute selectively - @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/31724") public void testJavaPatternLocale() { + assumeFalse("Can't run in a FIPS JVM, Joda parse date error", inFipsJvm()); // @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/31724") DateProcessor dateProcessor = new DateProcessor(randomAlphaOfLength(10), templatize(ZoneId.of("Europe/Amsterdam")), templatize(Locale.ITALIAN), "date_as_string", Collections.singletonList("yyyy dd MMMM"), "date_as_date"); From fb088537573af112ea22a8a80cfc50faf9ad2abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Sun, 3 Feb 2019 19:38:16 +0100 Subject: [PATCH 3/3] Update DateProcessorTests.java --- .../org/elasticsearch/ingest/common/DateProcessorTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java index 1ab1f617d9905..2e32e3fd0ebd2 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java @@ -113,7 +113,8 @@ public void testInvalidJavaPattern() { } public void testJavaPatternLocale() { - assumeFalse("Can't run in a FIPS JVM, Joda parse date error", inFipsJvm()); // @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/31724") + // @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/31724") + assumeFalse("Can't run in a FIPS JVM, Joda parse date error", inFipsJvm()); DateProcessor dateProcessor = new DateProcessor(randomAlphaOfLength(10), templatize(ZoneId.of("Europe/Amsterdam")), templatize(Locale.ITALIAN), "date_as_string", Collections.singletonList("yyyy dd MMMM"), "date_as_date");