Skip to content

Adding waiting guard for sudo #210

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding waiting guard for sudo #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions src/test/java/org/jenkinsci/plugins/docker/workflow/WithContainerStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ public class WithContainerStepTest {
@Override public void evaluate() throws Throwable {
DockerTestUtil.assumeDocker();
Process proc = new ProcessBuilder("sudo", "pgrep", "dockerd").inheritIO().start();
proc.waitFor(15, TimeUnit.SECONDS);
while(proc.isAlive()){
proc.waitFor(15, TimeUnit.SECONDS);
}
Assume.assumeThat("we are in an interactive environment and can pause dockerd", proc.exitValue(), Matchers.is(0));
logging.record("org.jenkinsci.plugins.workflow.support.concurrent.Timeout", Level.FINE); // TODO use Timeout.class when workflow-support 2.13+
WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "prj");
Expand All @@ -140,13 +142,17 @@ public class WithContainerStepTest {
WorkflowRun b = p.scheduleBuild2(0).waitForStart();
story.j.waitForMessage("+ sleep infinity", b);
proc = new ProcessBuilder("sudo", "killall", "-STOP", "dockerd").inheritIO().start();
proc.waitFor(15, TimeUnit.SECONDS);
while(proc.isAlive()) {
proc.waitFor(15, TimeUnit.SECONDS);
}
Assume.assumeThat("could suspend dockerd", proc.exitValue(), Matchers.is(0));
try {
story.j.assertBuildStatus(Result.ABORTED, story.j.waitForCompletion(b));
} finally {
proc = new ProcessBuilder("sudo", "killall", "-CONT", "dockerd").inheritIO().start();
proc.waitFor(15, TimeUnit.SECONDS);
while(proc.isAlive()) {
proc.waitFor(15, TimeUnit.SECONDS);
}
Assume.assumeThat("could resume dockerd", proc.exitValue(), Matchers.is(0));
}
} finally {
Expand Down