fix bug in detecting leftover directories, test changing builddirs on…

… existing builders

slave/buildslave/bot.py

@@ -274,7 +274,7 @@ def remote_setBuilderList(self, wanted):
                 del(self.builders[name])
 
         for d in os.listdir(self.basedir):
-            if os.path.isdir(d):
+            if os.path.isdir(os.path.join(self.basedir, d)):
                 if d not in wanted_dirs:
                     log.msg("I have a leftover directory '%s' that is not "
                             "being used by the buildmaster: you can delete "

slave/buildslave/test/unit/test_bot.py

@@ -112,12 +112,13 @@ def check(builders):
 
         def remove_my(_):
             d = self.bot.callRemote("setBuilderList", [
-                        ('yourbld', 'yourblddir') ])
+                        ('yourbld', 'yourblddir2') ]) # note new builddir
             def check(builders):
                 self.assertEqual(sorted(builders.keys()), sorted(['yourbld']))
                 # note that build dirs are not deleted..
                 self.assertTrue(os.path.exists(os.path.join(self.basedir, 'myblddir')))
                 self.assertTrue(os.path.exists(os.path.join(self.basedir, 'yourblddir')))
+                self.assertTrue(os.path.exists(os.path.join(self.basedir, 'yourblddir2')))
                 # 'your' should still be the same slavebuilder object
                 self.assertEqual(id(slavebuilders['your']), id(builders['yourbld']))
             d.addCallback(check)