Merged revisions 33810-33811 via svnmerge from

https://www.dev.java.net/svn/hudson/branches/rc

........
  r33810 | kohsuke | 2010-08-13 17:43:28 -0700 (Fri, 13 Aug 2010) | 1 line
  
  bug in the test harness.
........
  r33811 | kohsuke | 2010-08-13 17:44:11 -0700 (Fri, 13 Aug 2010) | 1 line
  
  bug in the test harness.
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33812 71c3de6d-444a-0410-be80-ed276b4c234a

test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java

@@ -554,7 +554,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
     }
 
     public DumbSlave createSlave(Label l, EnvVars env) throws Exception {
-        return createSlave(l.getName(), null);
+        return createSlave(l==null ? null : l.getName(), env);
     }
 
     /**