Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8341310: Test TestJcmdWithSideCar.java should skip ACCESS_TMP_VIA_PROC_ROOT (after JDK-8327114) #21289

Closed
wants to merge 5 commits into from
Closed
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions test/hotspot/jtreg/containers/docker/TestJcmdWithSideCar.java
Original file line number Diff line number Diff line change
@@ -247,13 +247,6 @@ static class MainContainer {
};

public Process start(final boolean elevated) throws Exception {
// Be sure no main container with the same name already exists
OutputAnalyzer out = DockerTestUtils.execute(Container.ENGINE_COMMAND, "ps")
.shouldHaveExitValue(0);
if (out.contains(MAIN_CONTAINER_NAME)) {
DockerTestUtils.execute(Container.ENGINE_COMMAND, "rm", MAIN_CONTAINER_NAME)
.shouldHaveExitValue(0);
}
// start "main" container (the observee)
DockerRunOptions opts = commonDockerOpts("EventGeneratorLoop");

@@ -308,9 +301,6 @@ public void waitForAndCheck(long timeout) throws Exception {
int retryCount = 3;

do {
// Kill the process, so as to speed up overall time of the
// test
p.destroy();
waitFor(timeout);
try {
exitValue = p.exitValue();
@@ -320,6 +310,9 @@ public void waitForAndCheck(long timeout) throws Exception {
}
} while (exitValue == -1 && retryCount > 0);

if (exitValue != 0) {
throw new RuntimeException("DockerThread stopped unexpectedly, non-zero exit value is " + exitValue);
}
}

}