From b7a16a24c4c86d88b5a790baf79c62578411f48e Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@zmanda.com>
Date: Thu, 21 Jan 2010 18:47:23 -0600
Subject: [PATCH] fix some tests .. but not all

---
 buildbot/test/runutils.py           | 11 -----------
 buildbot/test/test_locks.py         | 15 ++++++++-------
 buildbot/test/test_mergerequests.py | 23 +++++++++++------------
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/buildbot/test/runutils.py b/buildbot/test/runutils.py
index 9a77de1fa84..8af50471e8b 100644
--- a/buildbot/test/runutils.py
+++ b/buildbot/test/runutils.py
@@ -104,17 +104,6 @@ def connectSlave(self, builders=["dummy"], slavename="bot1",
         self.connectOneSlave(slavename, opts)
         return d
 
-    def connectSlaves(self, slavenames, builders):
-        dl = []
-        # initiate call for all of them, before waiting on result,
-        # otherwise we might miss some
-        for b in builders:
-            dl.append(self.master.botmaster.waitUntilBuilderAttached(b))
-        d = defer.DeferredList(dl)
-        for name in slavenames:
-            self.connectOneSlave(name)
-        return d
-
     def connectSlave2(self):
         # this takes over for bot1, so it has to share the slavename
         port = self.master.slavePort._port.getHost().port
diff --git a/buildbot/test/test_locks.py b/buildbot/test/test_locks.py
index 09dd0fb73a2..7cee29ab5f8 100644
--- a/buildbot/test/test_locks.py
+++ b/buildbot/test/test_locks.py
@@ -400,10 +400,10 @@ def setUp(self):
         req1.events = req2.events = req3.events = self.events = []
         d = self.master.loadConfig(config_1)
         d.addCallback(lambda res: self.master.startService())
-        d.addCallback(lambda res: self.connectSlaves(["bot1", "bot2"],
-                                                     ["full1a", "full1b",
-                                                      "full1c", "full1d",
-                                                      "full2a", "full2b"]))
+        d.addCallback(lambda res: self.connectSlave(
+                    ["full1a", "full1b", "full1c", "full1d"],
+                    "bot1"))
+        d.addCallback(lambda res: self.connectSlave(["full2a", "full2b"], "bot2"))
         return d
 
     def testLock1(self):
@@ -476,9 +476,10 @@ def setUp(self):
             self.reqs[i].events = self.events
         d = self.master.loadConfig(self.config)
         d.addCallback(lambda res: self.master.startService())
-        d.addCallback(lambda res: self.connectSlaves(["bot1", "bot2"],
-                                                     ["excl_A", "excl_B",
-                                                      "count_A", "count_B"]))
+        d.addCallback(lambda res: self.connectSlave(
+                    ["excl_A", "excl_B", "count_A", "count_B"], "bot1"))
+        d.addCallback(lambda res: self.connectSlave(
+                    ["excl_A", "excl_B", "count_A", "count_B"], "bot2"))
         return d
 
     def testOrder(self):
diff --git a/buildbot/test/test_mergerequests.py b/buildbot/test/test_mergerequests.py
index 0232b1da447..860010908ef 100644
--- a/buildbot/test/test_mergerequests.py
+++ b/buildbot/test/test_mergerequests.py
@@ -53,15 +53,14 @@ def do_test(self, mergefun, results, reqs = None):
                     R("changes", S("branch1", None, None, [c4,c5,c6]), 'test_builder'),
                     )
 
-        m = self.master
-        m.loadConfig(master_cfg % mergefun)
-        m.readConfig = True
-        m.startService()
-        builder = self.control.getBuilder('dummy')
-        for req in reqs:
-            builder.requestBuild(req)
-
-        d = self.connectSlave()
+        d = self.master.loadConfig(master_cfg % mergefun)
+        d.addCallback(lambda res: self.master.startService())
+        def request_builds(_):
+            builder = self.control.getBuilder('dummy')
+            for req in reqs:
+                builder.requestBuild(req)
+        d.addCallback(request_builds)
+        d.addCallback(lambda res : self.connectSlave())
         d.addCallback(self.waitForBuilds, results)
 
         return d
@@ -179,9 +178,9 @@ def testProperties(self):
                   properties = p1),
                 R("why", S("branch1", None, None, None), 'test_builder',
                   properties = p1),
-                R("why", S("branch1", None, None, None), 'test_builder',
+                R("why", S("branch2", None, None, None), 'test_builder',
                   properties = p2),
-                R("why", S("branch1", None, None, None), 'test_builder',
+                R("why", S("branch2", None, None, None), 'test_builder',
                   properties = p2),
                 )
         return self.do_test(mergefun,
@@ -189,7 +188,7 @@ def testProperties(self):
                               'branch': 'branch1',
                               'changecount': 0},
                              {'reason': 'why',
-                              'branch': 'branch1',
+                              'branch': 'branch2',
                               'changecount': 0},
                              ),
                             reqs=reqs)