De-flake QueueTest#persistenceBlockedItem (#7476)

jenkinsci · Dec 6, 2022 · b4772ca · b4772ca
1 parent 6065ba9
commit b4772ca
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java
@@ -266,7 +266,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
             }
         });
 
-        Future<FreeStyleBuild> b1 = p.scheduleBuild2(0);
+        FreeStyleBuild b1 = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b1);
         seq.phase(1);   // and make sure we have one build under way
 
@@ -280,6 +280,10 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         assertThat(items[0], instanceOf(BlockedItem.class));
 
         q.save();
+
+        assertTrue(q.cancel(items[0]));
+        seq.done();
+        r.assertBuildStatusSuccess(r.waitForCompletion(b1));
     }
 
     public static final class FileItemPersistenceTestServlet extends HttpServlet {