From f105becb14eb8de748be8906f5abe6b66709ac54 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 1 Apr 2011 21:33:29 -0700 Subject: [PATCH] added another convenience method --- .../main/java/org/jvnet/hudson/test/HudsonTestCase.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index b264e53c16..91a20b6ab7 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -685,11 +685,14 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { */ public DumbSlave createSlave(String labels, EnvVars env) throws Exception { synchronized (hudson) { - // this synchronization block is so that we don't end up adding the same slave name more than once. - int sz = hudson.getNodes().size(); + return createSlave("slave" + sz,labels,env); + } + } - DumbSlave slave = new DumbSlave("slave" + sz, "dummy", + public DumbSlave createSlave(String nodeName, String labels, EnvVars env) throws Exception { + synchronized (hudson) { + DumbSlave slave = new DumbSlave(nodeName, "dummy", createTmpDir().getPath(), "1", Mode.NORMAL, labels==null?"":labels, createComputerLauncher(env), RetentionStrategy.NOOP, Collections.EMPTY_LIST); hudson.addNode(slave); return slave;