Correctly disable tests for FIPS JVMs (#38871)

talevy · web-flow · commit 5ab247982402 · 2019-02-13T17:33:16.000-08:00
Replace assertFalse with assumeFalse resolves #38212. backport of #38214.
diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java
@@ -144,7 +144,7 @@ public void testClientSucceedsWithCertificateAuthorities() throws IOException {
     }
 
     public void testClientSucceedsWithVerificationDisabled() throws IOException {
-        assertFalse("Cannot disable verification in FIPS JVM", inFipsJvm());
+        assumeFalse("Cannot disable verification in FIPS JVM", inFipsJvm());
         final List<Thread> threads = new ArrayList<>();
         final Settings settings = Settings.builder()
             .put("path.home", createTempDir())

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public void testClientSucceedsWithCertificateAuthorities() throws IOException {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`public void testClientSucceedsWithVerificationDisabled() throws IOException {`
`147`		`- assertFalse("Cannot disable verification in FIPS JVM", inFipsJvm());`
	`147`	`+ assumeFalse("Cannot disable verification in FIPS JVM", inFipsJvm());`
`148`	`148`	`final List<Thread> threads = new ArrayList<>();`
`149`	`149`	`final Settings settings = Settings.builder()`
`150`	`150`	`.put("path.home", createTempDir())`