root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Stop build in `DeleteBuildsCommandTest.deleteBuildsShouldFailIfTheBuildIsRunning` so test can be cleaned up on Windows consistently (#9876) 

(cherry picked from commit 5019eb900c)
This commit is contained in:
Devin Nusbaum 2024-10-15 17:36:47 -04:00 committed by Basil Crow
parent d383906fbe
commit 0e831a32aa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java
View File

@ -36,6 +36,7 @@ import static org.junit.Assert.assertNotNull;
import hudson.model.ExecutorTest;
import hudson.model.FreeStyleProject;
import hudson.model.Item;
import hudson.model.Result;
import hudson.model.Run;
import hudson.model.labels.LabelAtom;
import hudson.tasks.Shell;
@ -139,7 +140,7 @@ public class DeleteBuildsCommandTest {
@Issue("JENKINS-73835")
@Test public void deleteBuildsShouldFailIfTheBuildIsRunning() throws Exception {
FreeStyleProject project = j.createFreeStyleProject("aProject");
ExecutorTest.startBlockingBuild(project);
var build = ExecutorTest.startBlockingBuild(project);
assertThat(((FreeStyleProject) j.jenkins.getItem("aProject")).getBuilds(), hasSize(1));
final CLICommandInvoker.Result result = command
@ -148,6 +149,9 @@ public class DeleteBuildsCommandTest {
assertThat(result, failedWith(1));
assertThat(result, hasNoStandardOutput());
assertThat(result.stderr(), containsString("Unable to delete aProject #1 because it is still running"));
build.doStop();
j.assertBuildStatus(Result.ABORTED, j.waitForCompletion(build));
}
@Test public void deleteBuildsShouldSuccessEvenTheBuildIsStuckInTheQueue() throws Exception {