Skip to content

Commit ee61c04

Browse files
authored
Remove eof from expect script (#84287)
Hopefully fixes #84204. When we build an expect script in the packaging tests, we insert `expect eof` after supplying the password. This makes expect wait until the output of ES is closed, which isn't actaully what we want, as we then go on to expect on a number of other outputs. So, remove this `eof`, and let the other expectations do their work.
1 parent 5afdc76 commit ee61c04

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

qa/os/src/test/java/org/elasticsearch/packaging/test/KeystoreManagementTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ public void test41WrongKeystorePasswordOnStandardInput() throws Exception {
167167
/**
168168
* This test simulates a user starting Elasticsearch on the command line without daemonizing
169169
*/
170-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/84204")
171170
public void test42KeystorePasswordOnTtyRunningInForeground() throws Exception {
172171
/* Windows issue awaits fix: https://github.com/elastic/elasticsearch/issues/49340 */
173172
assumeTrue("expect command isn't on Windows", distribution.platform != Distribution.Platform.WINDOWS);

qa/os/src/test/java/org/elasticsearch/packaging/util/Archives.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,7 @@ public static Shell.Result startElasticsearchWithTty(Installation installation,
250250
String keystoreScript = keystorePassword == null
251251
? ""
252252
: asBlock("expect \"Elasticsearch keystore password:\"",
253-
"send \"" + keystorePassword + "\\r\"",
254-
"expect eof");
253+
"send \"" + keystorePassword + "\\r\"");
255254
String checkStartupScript = daemonize
256255
? ""
257256
: asBlock("expect {",

0 commit comments

Comments
 (0)