Improve TriggerableScheduler tests to be less fake.

master/buildbot/schedulers/triggerable.py

@@ -35,7 +35,9 @@ def __init__(self, name, builderNames, properties={}, **kwargs):
 
     def trigger(self, sourcestamps = None, set_props=None):
         """Trigger this scheduler with the optional given list of sourcestamps
-        Returns a deferred that will fire when the buildset is finished."""
+        Returns two deferreds:
+            idsDeferred -- yields the ids of the buildset and buildrequest, as soon as they are available.
+            resultsDeferred -- yields the build result(s), when they finish."""
         # properties for this buildset are composed of our own properties,
         # potentially overridden by anything from the triggering build
         props = Properties()
@@ -46,15 +48,17 @@ def trigger(self, sourcestamps = None, set_props=None):
         # note that this does not use the buildset subscriptions mechanism, as
         # the duration of interest to the caller is bounded by the lifetime of
         # this process.
-        d = self.addBuildsetForSourceStampsWithDefaults(self.reason,
+        idsDeferred = self.addBuildsetForSourceStampsWithDefaults(self.reason,
                                                 sourcestamps, props)
-        def setup_waiter((bsid,brids)):
-            d = defer.Deferred()
-            self._waiters[bsid] = (d, brids)
+        resultsDeferred = defer.Deferred()
+        def setup_waiter(ids):
+            bsid, brids = ids
+            self._waiters[bsid] = (resultsDeferred, brids)
             self._updateWaiters()
-            return d
-        d.addCallback(setup_waiter)
-        return d
+            return ids
+
+        idsDeferred.addCallback(setup_waiter)
+        return idsDeferred, resultsDeferred
 
     def stopService(self):
         # cancel any outstanding subscription

master/buildbot/test/fake/fakedata.py

@@ -116,7 +116,7 @@ def addBuildset(self, scheduler=None, sourcestamps=[], reason='',
             if not isinstance(ss, int) and not isinstance(ss, dict):
                 self.testcase.fail("%s (%s) is not an integer or a dictionary"
                                         % (ss, type(ss)))
-        del ss # since we use locals(), below
+            del ss # since we use locals(), below
         self.testcase.assertIsInstance(reason, unicode)
         self.assertProperties(sourced=True, properties=properties)
         self.testcase.assertIsInstance(builderNames, list)

master/buildbot/test/unit/test_schedulers_triggerable.py

@@ -13,6 +13,7 @@
 #
 # Copyright Buildbot Team Members
 
+from twisted.internet import defer
 from twisted.python import log
 from twisted.trial import unittest
 from buildbot.schedulers import triggerable
@@ -33,20 +34,79 @@ def tearDown(self):
     def makeScheduler(self, **kwargs):
         sched = self.attachScheduler(
                 triggerable.Triggerable(name='n', builderNames=['b'], **kwargs),
-                self.OBJECTID, overrideBuildsetMethods=True)
+                self.OBJECTID)
 
         return sched
 
-    def assertTriggeredBuildset(self, properties={}, sourcestamps=None):
+    @defer.inlineCallbacks
+    def assertTriggeredBuildset(self, idsDeferred, properties={}, sourcestamps=None):
+        bsid, brids = yield idsDeferred
         properties.update({ u'scheduler' : ( 'n', u'Scheduler') })
-        self.assertEqual(self.addBuildsetCalls, [
-            ('addBuildsetForSourceStampsWithDefaults', dict(
-                builderNames=None, # uses the default
-                properties=properties,
-                reason=u'Triggerable(n)',
-                sourcestamps=sourcestamps)),
+
+        self.assertEqual(
+            self.master.db.buildsets.buildsets[bsid]['properties'],
+            properties,
+        )
+
+        buildset = yield self.master.db.buildsets.getBuildset(bsid)
+
+        #from datetime import datetime
+        #from buildbot.util import UTC
+        buildset.pop('submitted_at') # TODO
+        ssids = buildset.pop('sourcestamps')
+
+        self.assertEqual(
+            buildset,
+            {
+                'bsid': bsid,
+                'complete': False,
+                'complete_at': None,
+                'external_idstring': None,
+                'reason': u'Triggerable(n)',
+                'results': -1,
+                #'sourcestamps': [100],
+                #'submitted_at': datetime(2013, 8, 13, 0, 39, 55, 799986, tzinfo=UTC),
+            }
+        )
+
+
+        actual_sourcestamps = yield defer.gatherResults([
+            self.master.db.sourcestamps.getSourceStamp(ssid)
+            for ssid in ssids
         ])
-        self.addBuildsetCalls = []
+
+        self.assertEqual(len(sourcestamps), len(actual_sourcestamps))
+        for expected_ss, actual_ss in zip(sourcestamps, actual_sourcestamps):
+            actual_ss = actual_ss.copy()
+            # We don't care if the actual sourcestamp has *more* attributes than expected.
+            for key in actual_ss.keys():
+                if key not in expected_ss:
+                    del actual_ss[key]
+            self.assertEqual(expected_ss, actual_ss)
+
+
+        for brid in brids.values():
+            #from datetime import datetime
+            #from buildbot.util import UTC
+            buildrequest = yield self.master.db.buildrequests.getBuildRequest(brid)
+            buildrequest.pop('submitted_at') # TODO
+            self.assertEqual(
+                buildrequest,
+                {
+                    'brid': brid,
+                    'buildername': u'b',
+                    'buildsetid': bsid,
+                    'claimed': False,
+                    'claimed_at': None,
+                    'complete': False,
+                    'complete_at': None,
+                    'mine': False,
+                    'priority': 0,
+                    'results': -1,
+                    'waited_for': False,
+                }
+            )
+
 
     def sendCompletionMessage(self, bsid, results=3):
         self.master.mq.callConsumer(('buildset', str(bsid), 'complete'),
@@ -81,9 +141,10 @@ def test_trigger(self):
               'project':'p',
               'repository':'r',
               'codebase':'cb' }
-        d = sched.trigger([ss], set_props=set_props)
+        idsDeferred, d = sched.trigger([ss], set_props=set_props)
 
         self.assertTriggeredBuildset(
+            idsDeferred,
             properties={ u'pr': ('op', u'test') },
             sourcestamps=[
                  dict(branch='br', project='p', repository='r',
@@ -94,7 +155,7 @@ def test_trigger(self):
         self.fired = False
         def fired((result, brids)):
             self.assertEqual(result, 3) # from sendCompletionMessage
-            self.assertEqual(brids, {u'b':100})
+            self.assertEqual(brids, {u'b':1000})
             self.fired = True
         d.addCallback(fired)
         d.addErrback(log.err)
@@ -116,7 +177,7 @@ def fired((result, brids)):
         self.assertFalse(self.fired)
 
         # pretend the matching buildset is complete
-        self.sendCompletionMessage(500)
+        self.sendCompletionMessage(200)
 
         # scheduler should have reacted
         self.assertEqual(
@@ -136,24 +197,26 @@ def makeSS(rev):
                      'repository':'r', 'codebase':'cb' }
 
         # trigger the scheduler the first time
-        d = sched.trigger([makeSS('myrev1')]) # triggers bsid 500
+        idsDeferred, d = sched.trigger([makeSS('myrev1')]) # triggers bsid 200
         self.assertTriggeredBuildset(
+            idsDeferred,
             sourcestamps=[
                  dict(branch='br', project='p', repository='r',
                      codebase='cb', revision='myrev1'),
                 ])
         d.addCallback(lambda (res, brids) : self.assertEqual(res, 11)
-                and self.assertEqual(brids, {u'b':100}))
+                and self.assertEqual(brids, {u'b':1000}))
 
         # and the second time
-        d = sched.trigger([makeSS('myrev2')]) # triggers bsid 501
+        idsDeferred, d = sched.trigger([makeSS('myrev2')]) # triggers bsid 201
         self.assertTriggeredBuildset(
+            idsDeferred,
             sourcestamps=[
                  dict(branch='br', project='p', repository='r',
                      codebase='cb', revision='myrev2'),
                 ])
         d.addCallback(lambda (res, brids) : self.assertEqual(res, 22) 
-                and self.assertEqual(brids, {u'b':101}))
+                and self.assertEqual(brids, {u'b':1001}))
 
         # check that the scheduler has subscribed to buildset changes
         self.assertEqual(
@@ -162,9 +225,9 @@ def makeSS(rev):
 
         # let a few buildsets complete
         self.sendCompletionMessage(29, results=3)
-        self.sendCompletionMessage(501, results=22)
+        self.sendCompletionMessage(201, results=22)
         self.sendCompletionMessage(9, results=3)
-        self.sendCompletionMessage(500, results=11)
+        self.sendCompletionMessage(200, results=11)
 
         # both should have triggered with appropriate results, and the
         # subscription should be cancelled
@@ -180,14 +243,14 @@ def test_trigger_with_sourcestamp(self):
 
         ss = {'repository': 'r3', 'codebase': 'cb3', 'revision': 'fixrev3',
                'branch': 'default', 'project': 'p' }
-        sched.trigger(sourcestamps=[ss])
+        idsDeferred = sched.trigger(sourcestamps=[ss])[0]
 
-        self.assertTriggeredBuildset(sourcestamps=[ss])
+        self.assertTriggeredBuildset(idsDeferred, sourcestamps=[ss])
 
     def test_trigger_without_sourcestamps(self):
         # Test a scheduler with 2 repositories.
         # Trigger the scheduler without a sourcestamp; this should translate to
         # a call to addBuildsetForSourceStampsWithDefaults with no sourcestamps
         sched = self.makeScheduler()
-        sched.trigger(sourcestamps=[])
-        self.assertTriggeredBuildset(sourcestamps=[])
+        idsDeferred = sched.trigger(sourcestamps=[])[0]
+        self.assertTriggeredBuildset(idsDeferred, sourcestamps=[])