Skip to content

Commit ac6602a

Browse files
authored
Fix windows newline issue in test (#51082)
Fixes HttpCertificateCommandTests.testTextFileSubstitutions on Windows Backport of: #51030
1 parent c1a6d5d commit ac6602a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.google.common.jimfs.Configuration;
1010
import com.google.common.jimfs.Jimfs;
1111
import joptsimple.OptionSet;
12-
import org.apache.lucene.util.Constants;
1312
import org.bouncycastle.asn1.DERIA5String;
1413
import org.bouncycastle.asn1.DEROctetString;
1514
import org.bouncycastle.asn1.DERSequence;
@@ -537,13 +536,12 @@ public void testGuessFileType() throws Exception {
537536
}
538537

539538
public void testTextFileSubstitutions() throws Exception {
540-
assumeFalse("https://github.com/elastic/elasticsearch/issues/50964", Constants.WINDOWS);
541539
CheckedBiFunction<String, Map<String, String>, String, Exception> copy = (source, subs) -> {
542540
try (InputStream in = new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8));
543541
StringWriter out = new StringWriter();
544542
PrintWriter writer = new PrintWriter(out)) {
545543
HttpCertificateCommand.copyWithSubstitutions(in, writer, subs);
546-
return out.toString();
544+
return out.toString().replace("\r\n", "\n");
547545
}
548546
};
549547
assertThat(copy.apply("abc\n", Collections.emptyMap()), is("abc\n"));

0 commit comments

Comments
 (0)