Fix windows newline issue in test

Fixes HttpCertificateCommandTests.testTextFileSubstitutions on Windows Resolves: elastic#50964 Backport of: elastic#51030
tvernum · Jan 16, 2020 · a1a32bb · a1a32bb
1 parent c1a6d5d
commit a1a32bb
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/...y/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java b/...y/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, Map<String, String>, 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"));