From 4fa1d0ebfae499bed34a568fd5a6f2e64ddbd1ea Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Mon, 13 Aug 2018 21:27:06 +0300 Subject: [PATCH] Mute security-cli tests in FIPS JVM (#32812) All Unit tests in this module are muted in FIPS 140 JVMs and as such the CI run fails. This commit disables test task for the module in a FIPS JVM and reverts adding a dummy test in 4cbcc1. --- x-pack/plugin/security/cli/build.gradle | 7 ++++++- .../cli/TestSuiteCannotBeEmptyTests.java | 16 ---------------- 2 files changed, 6 insertions(+), 17 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/build.gradle b/x-pack/plugin/security/cli/build.gradle index 578c006e7f0c8..7ffe5d363729d 100644 --- a/x-pack/plugin/security/cli/build.gradle +++ b/x-pack/plugin/security/cli/build.gradle @@ -17,4 +17,9 @@ dependencies { dependencyLicenses { mapping from: /bc.*/, to: 'bouncycastle' -} \ No newline at end of file +} + +if (inFipsJvm) { + test.enabled = false +} + 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 - } -}