Skip to content

Delete builds in QueueTest to prevent Windows test failures #26104

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

Merged
MarkEWaite merged 2 commits into from
Jan 12, 2026
Merged

Delete builds in QueueTest to prevent Windows test failures #26104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0264a1f
Remove noisy test logging from QueueTest
MarkEWaite Jan 11, 2026
ca53cdb
Stop and delete builds 1 and 2 in QueueTest to prevent Windows test f…
MarkEWaite Jan 11, 2026
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
28 changes: 16 additions & 12 deletions test/src/test/java/hudson/model/QueueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@
import java.io.UncheckedIOException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -112,7 +110,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
import jenkins.model.BlockedBecauseOfBuildInProgress;
import jenkins.model.Jenkins;
Expand All @@ -132,7 +129,6 @@
import org.junit.jupiter.api.Test;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.LogRecorder;
import org.jvnet.hudson.test.MockAuthorizationStrategy;
import org.jvnet.hudson.test.MockQueueItemAuthenticator;
import org.jvnet.hudson.test.SequenceLock;
Expand All @@ -150,8 +146,6 @@
@WithJenkins
public class QueueTest {

private final LogRecorder logging = new LogRecorder().record(Queue.class, Level.FINE);

private JenkinsRule r;

@BeforeEach
Expand All @@ -173,8 +167,6 @@ void persistence() throws Exception {
assertNotNull(testProject.scheduleBuild2(0, new UserIdCause()));
q.save();

System.out.println(Files.readString(r.jenkins.getRootDir().toPath().resolve("queue.xml"), StandardCharsets.UTF_8));

assertEquals(1, q.getItems().length);
q.clear();
assertEquals(0, q.getItems().length);
Expand Down Expand Up @@ -228,8 +220,6 @@ void persistence2() throws Exception {
assertNotNull(testProject.scheduleBuild2(0, new UserIdCause()));
q.save();

System.out.println(Files.readString(r.jenkins.getRootDir().toPath().resolve("queue.xml"), StandardCharsets.UTF_8));

assertEquals(1, q.getItems().length);
q.clear();
assertEquals(0, q.getItems().length);
Expand Down Expand Up @@ -372,7 +362,6 @@ Started by timer (2 times)
Started by remote host 4.3.2.1 with note: test
Started by remote host 1.2.3.4 with note: foo"""),
"Build page should combine duplicates and show counts: " + buildPage);
System.out.println(new XmlFile(new File(build.getRootDir(), "build.xml")).asString());
}

@Issue("JENKINS-8790")
Expand Down Expand Up @@ -1243,7 +1232,22 @@ void testGetCauseOfBlockageForNonConcurrentFreestyle() throws Exception {

assertEquals(expected.getShortDescription(), actual.getShortDescription());
Queue.getInstance().doCancelItem(r.jenkins.getQueue().getBlockedItems().get(0).getId());
r.assertBuildStatusSuccess(r.waitForCompletion(build));

build.doStop(); // Stop build 1 early
r.waitForCompletion(build);
build.delete(); // Delete build 1

// Stop and delete build 2 if it is running. Seen running on slower Windows computers
if (t1.isBuilding()) {
FreeStyleBuild build2 = t1.getLastBuild();
build2.doStop();
r.waitForCompletion(build2);
build2.delete();
}

assertFalse(t1.isBuilding(), "Job unexpectedly building");
assertNull(t1.getQueueItem(), "Job unexpectedly has non-null entry in queue " + t1.getQueueItem());
assertFalse(t1.isInQueue(), "Job unexpectedly in queue");
}

@Test
Expand Down
Loading