From 9fe1ca5ff1176701ba312e9ae55415deb2a89dc4 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Mon, 13 Aug 2018 18:03:57 +0300 Subject: [PATCH 1/2] Disable unit tests in FIPS JVM --- x-pack/plugin/security/cli/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x-pack/plugin/security/cli/build.gradle b/x-pack/plugin/security/cli/build.gradle index 19b86dd91c78b..1a00b2a034000 100644 --- a/x-pack/plugin/security/cli/build.gradle +++ b/x-pack/plugin/security/cli/build.gradle @@ -18,3 +18,7 @@ dependencies { dependencyLicenses { mapping from: /bc.*/, to: 'bouncycastle' } + +if (inFipsJvm) { + test.enabled = false +} \ No newline at end of file From 55f2ca389ecba72ace1ecfff91447ed5ccdaef8d Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Mon, 13 Aug 2018 18:04:02 +0300 Subject: [PATCH 2/2] Revert "[TEST] Add empty test case for FIPS" This reverts commit 4cbcc1d659c7d51703345cce01f51fb24f4e9bde. --- .../cli/TestSuiteCannotBeEmptyTests.java | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/TestSuiteCannotBeEmptyTests.java diff --git a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/TestSuiteCannotBeEmptyTests.java b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/TestSuiteCannotBeEmptyTests.java deleted file mode 100644 index 6079a9e867091..0000000000000 --- a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/TestSuiteCannotBeEmptyTests.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -package org.elasticsearch.xpack.security.cli; - -import org.elasticsearch.test.ESTestCase; - -public class TestSuiteCannotBeEmptyTests extends ESTestCase { - - public void testIsHereSoThisSuiteIsNonEmpty() { - // This is needed on a FIPS JVM as the rest of the suite is skipped - } -}