From ff672d9c295cc2e5a1027b09072d289a02e7b801 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 7 Aug 2010 23:03:49 +0000 Subject: [PATCH] added another test. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33621 71c3de6d-444a-0410-be80-ed276b4c234a --- .../model/label/LabelExpressionTest.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/test/src/test/java/hudson/model/label/LabelExpressionTest.java b/test/src/test/java/hudson/model/label/LabelExpressionTest.java index 6e1e0e4560..c8cb239276 100644 --- a/test/src/test/java/hudson/model/label/LabelExpressionTest.java +++ b/test/src/test/java/hudson/model/label/LabelExpressionTest.java @@ -47,7 +47,7 @@ public class LabelExpressionTest extends HudsonTestCase { public void testQueueBehavior() throws Exception { DumbSlave w32 = createSlave("win 32bit",null); DumbSlave w64 = createSlave("win 64bit",null); - DumbSlave l32 = createSlave("linux 32bit",null); + createSlave("linux 32bit",null); final SequenceLock seq = new SequenceLock(); @@ -90,6 +90,28 @@ public class LabelExpressionTest extends HudsonTestCase { assertSame(w32,b2.getBuiltOn()); } + /** + * Push the build around to different nodes via the assignment + * to make sure it gets where we need it to. + */ + public void testQueueBehavior2() throws Exception { + DumbSlave s = createSlave("win",null); + + FreeStyleProject p = createFreeStyleProject(); + + p.setAssignedLabel(hudson.getLabel("!win")); + FreeStyleBuild b = assertBuildStatusSuccess(p.scheduleBuild2(0)); + assertSame(hudson,b.getBuiltOn()); + + p.setAssignedLabel(hudson.getLabel("win")); + b = assertBuildStatusSuccess(p.scheduleBuild2(0)); + assertSame(s,b.getBuiltOn()); + + p.setAssignedLabel(hudson.getLabel("!win")); + b = assertBuildStatusSuccess(p.scheduleBuild2(0)); + assertSame(hudson,b.getBuiltOn()); + } + /** * Tests the expression parser. */ -- GitLab