Skip to content

Fix race condition in ShellStepTest.abort #118

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

Closed
slonopotamus wants to merge 1 commit into from
Closed

Fix race condition in ShellStepTest.abort #118

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
9 changes: 5 additions & 4 deletions src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/ShellStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import hudson.model.ParametersDefinitionProperty;
import hudson.model.Result;
import hudson.model.Run;
import hudson.model.queue.QueueTaskFuture;
import hudson.remoting.Channel;
import hudson.model.Slave;
import hudson.model.TaskListener;
Expand Down Expand Up @@ -183,14 +184,16 @@ public void abort() throws Exception {
"node {sh 'while true; do touch " + tmp + "; sleep 1; done'}", true));

// get the build going, and wait until workflow pauses
WorkflowRun b = foo.scheduleBuild2(0).getStartCondition().get();
final QueueTaskFuture<WorkflowRun> f = foo.scheduleBuild2(0);
WorkflowRun b = f.getStartCondition().get();

// at this point the file should be being touched
while (!Files.exists(tmp)) {
Thread.sleep(100);
}

b.getExecutor().interrupt();
b.doStop();
j.assertBuildStatus(Result.ABORTED, f.get());

// touching should have stopped
final long refTimestamp = Files.getLastModifiedTime(tmp).toMillis();
Expand All @@ -201,8 +204,6 @@ public void abort() throws Exception {
throw new UncheckedIOException(e);
}
});

j.assertBuildStatus(Result.ABORTED, j.waitForCompletion(b));
}

@Issue("JENKINS-41339")
Expand Down