From 542ab897f0d6e70ebaecd75b892a0330dec79b10 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 21 Oct 2009 15:51:16 +0000 Subject: [PATCH] fixed a race condition in a test. mindless discovered that m.scheduleBuild2(0).get(0) has a cascading effect on module builds, which can cause later m.getModule(...).scheduleBuild2(0) to return null, as it may be already in the queue. I initially wanted to fix this by making Queue.schedule() returns the existing item if it's already in the queue, but this turns out to be inpractical given that the signature is WaitingItem and not Item. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22991 71c3de6d-444a-0410-be80-ed276b4c234a --- test/src/test/java/hudson/maven/MavenBuildTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/src/test/java/hudson/maven/MavenBuildTest.java b/test/src/test/java/hudson/maven/MavenBuildTest.java index 89c64b3e15..3e191f078b 100644 --- a/test/src/test/java/hudson/maven/MavenBuildTest.java +++ b/test/src/test/java/hudson/maven/MavenBuildTest.java @@ -81,9 +81,11 @@ public class MavenBuildTest extends HudsonTestCase { SubversionSCM scm = new SubversionSCM("https://www.dev.java.net/svn/hudson/trunk/hudson/test-projects/multimodule-maven"); setJavaNetCredential(scm); m.setScm(scm); - m.setAggregatorStyleBuild(false); assertBuildStatusSuccess(m.scheduleBuild2(0).get()); + + m.setAggregatorStyleBuild(false); + // run module builds assertBuildStatusSuccess(m.getModule("test$module1").scheduleBuild2(0).get()); assertBuildStatusSuccess(m.getModule("test$module1").scheduleBuild2(0).get()); -- GitLab