Skip to content

Commit 61d7646

Browse files
authored
[7.17] Make docker packaging test more resilient (#111205) (#111209)
* Make docker packaging test more resilient (#111205) Wrap check for container shutdown log message in an `assertBusy()` to deal with race conditions. Closes #111132 # Conflicts: # muted-tests.yml # qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java * Fix compile issue
1 parent 0d3f9b7 commit 61d7646

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,10 +1108,12 @@ public void test600Interrupt() throws Exception {
11081108
int maxPid = processes.stream().map(i -> Integer.parseInt(i.trim())).max(Integer::compareTo).get();
11091109

11101110
sh.run("bash -c 'kill -int " + maxPid + "'"); // send ctrl+c to all java processes
1111-
final Result containerLogsAfter = getContainerLogs();
11121111

1113-
assertThat("Container logs should contain stopping ...", containerLogsAfter.stdout, containsString("stopping ..."));
1114-
assertThat("No errors stdout", containerLogsAfter.stdout, not(containsString("java.security.AccessControlException:")));
1115-
assertThat("No errors stderr", containerLogsAfter.stderr, not(containsString("java.security.AccessControlException:")));
1112+
assertBusy(() -> {
1113+
final Result containerLogsAfter = getContainerLogs();
1114+
assertThat("Container logs should contain stopping ...", containerLogsAfter.stdout, containsString("stopping ..."));
1115+
assertThat("No errors stdout", containerLogsAfter.stdout, not(containsString("java.security.AccessControlException:")));
1116+
assertThat("No errors stderr", containerLogsAfter.stderr, not(containsString("java.security.AccessControlException:")));
1117+
});
11161118
}
11171119
}

0 commit comments

Comments
 (0)