提交 0b8917b3 编写于 作者: K Kohsuke Kawaguchi

fixed test regressions

上级 afcd081b
......@@ -855,9 +855,8 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
* Schedules a build of this project.
*
* @return
* true if the project is actually added to the queue.
* false if the queue contained it and therefore the add()
* was noop
* true if the project is added to the queue.
* false if the task was rejected from the queue (such as when the system is being shut down.)
*/
public boolean scheduleBuild(Cause c) {
return scheduleBuild(getQuietPeriod(), c);
......
......@@ -249,16 +249,16 @@ public class QueueTest extends HudsonTestCase {
// Schedule a new build, and trigger it many ways while it sits in queue
Future<FreeStyleBuild> fb = project.scheduleBuild2(0, new UserIdCause());
assertNotNull(fb);
assertFalse(project.scheduleBuild(new SCMTriggerCause("")));
assertFalse(project.scheduleBuild(new UserIdCause()));
assertFalse(project.scheduleBuild(new TimerTriggerCause()));
assertFalse(project.scheduleBuild(new RemoteCause("1.2.3.4", "test")));
assertFalse(project.scheduleBuild(new RemoteCause("4.3.2.1", "test")));
assertFalse(project.scheduleBuild(new SCMTriggerCause("")));
assertFalse(project.scheduleBuild(new RemoteCause("1.2.3.4", "test")));
assertFalse(project.scheduleBuild(new RemoteCause("1.2.3.4", "foo")));
assertFalse(project.scheduleBuild(new SCMTriggerCause("")));
assertFalse(project.scheduleBuild(new TimerTriggerCause()));
assertTrue(project.scheduleBuild(new SCMTriggerCause("")));
assertTrue(project.scheduleBuild(new UserIdCause()));
assertTrue(project.scheduleBuild(new TimerTriggerCause()));
assertTrue(project.scheduleBuild(new RemoteCause("1.2.3.4", "test")));
assertTrue(project.scheduleBuild(new RemoteCause("4.3.2.1", "test")));
assertTrue(project.scheduleBuild(new SCMTriggerCause("")));
assertTrue(project.scheduleBuild(new RemoteCause("1.2.3.4", "test")));
assertTrue(project.scheduleBuild(new RemoteCause("1.2.3.4", "foo")));
assertTrue(project.scheduleBuild(new SCMTriggerCause("")));
assertTrue(project.scheduleBuild(new TimerTriggerCause()));
// Wait for 2nd build to finish
buildShouldComplete.signal();
......
......@@ -124,9 +124,9 @@ public class SCMTriggerTest extends HudsonTestCase {
// Schedule a new build, and trigger it many ways while it sits in queue
Future<FreeStyleBuild> fb = p.scheduleBuild2(0, new UserCause());
assertNotNull(fb);
assertFalse(p.scheduleBuild(new SCMTriggerCause("First poll")));
assertFalse(p.scheduleBuild(new SCMTriggerCause("Second poll")));
assertFalse(p.scheduleBuild(new SCMTriggerCause("Third poll")));
assertTrue(p.scheduleBuild(new SCMTriggerCause("First poll")));
assertTrue(p.scheduleBuild(new SCMTriggerCause("Second poll")));
assertTrue(p.scheduleBuild(new SCMTriggerCause("Third poll")));
// Wait for 2nd build to finish
buildShouldComplete.signal();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册