Merge branch 'main' into lucene_snapshot_10_2_1

julio-santana · web-flow · commit 24403022d896 · 2025-04-21T15:19:17.000-06:00
diff --git a/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/cli/keystore/AddStringKeyStoreCommandTests.java b/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/cli/keystore/AddStringKeyStoreCommandTests.java
@@ -193,7 +193,7 @@ public void testStdinInputWithCarriageReturn() throws Exception {
         String password = "keystorepassword";
         KeyStoreWrapper.create().save(env.configDir(), password.toCharArray());
         terminal.addSecretInput(password);
-        terminal.addSecretInput("Typedthisandhitenter\r");
+        terminal.addSecretInput("Typedthisandhitenter\r\n");
         execute("-x", "foo");
         assertSecureString("foo", "Typedthisandhitenter", password);
     }

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public void testStdinInputWithCarriageReturn() throws Exception {`
`193`	`193`	`String password = "keystorepassword";`
`194`	`194`	`KeyStoreWrapper.create().save(env.configDir(), password.toCharArray());`
`195`	`195`	`terminal.addSecretInput(password);`
`196`		`- terminal.addSecretInput("Typedthisandhitenter\r");`
	`196`	`+ terminal.addSecretInput("Typedthisandhitenter\r\n");`
`197`	`197`	`execute("-x", "foo");`
`198`	`198`	`assertSecureString("foo", "Typedthisandhitenter", password);`
`199`	`199`	`}`