From a1a32bb90868356141f7540cef46e1d81a118fed Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Thu, 16 Jan 2020 15:30:20 +1100 Subject: [PATCH] Fix windows newline issue in test Fixes HttpCertificateCommandTests.testTextFileSubstitutions on Windows Resolves: #50964 Backport of: #51030 --- .../xpack/security/cli/HttpCertificateCommandTests.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java index 1021d5af55a5d..a21eb0efa773f 100644 --- a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java +++ b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java @@ -9,7 +9,6 @@ import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; import joptsimple.OptionSet; -import org.apache.lucene.util.Constants; import org.bouncycastle.asn1.DERIA5String; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DERSequence; @@ -537,13 +536,12 @@ public void testGuessFileType() throws Exception { } public void testTextFileSubstitutions() throws Exception { - assumeFalse("https://github.com/elastic/elasticsearch/issues/50964", Constants.WINDOWS); CheckedBiFunction, String, Exception> copy = (source, subs) -> { try (InputStream in = new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)); StringWriter out = new StringWriter(); PrintWriter writer = new PrintWriter(out)) { HttpCertificateCommand.copyWithSubstitutions(in, writer, subs); - return out.toString(); + return out.toString().replace("\r\n", "\n"); } }; assertThat(copy.apply("abc\n", Collections.emptyMap()), is("abc\n"));