add db.buildsets.completeBuildset

master/buildbot/db/buildsets.py

@@ -100,6 +100,37 @@ def thd(conn):
             return (bsid, brids)
         return self.db.pool.do(thd)
 
+    def completeBuildset(self, bsid, results, _reactor=reactor):
+        """
+        Complete a buildset, marking it with the given C{results} and setting
+        its C{completed_at} to the current time.
+
+        @param bsid: buildset ID to complete
+        @type bsid: integer
+
+        @param results: integer result code
+        @type results: integer
+
+        @param _reactor: reactor to use (for testing)
+
+        @returns: Deferred
+        @raises KeyError: if the row does not exist or is already complete
+        """
+        def thd(conn):
+            tbl = self.db.model.buildsets
+
+            q = tbl.update(whereclause=(
+                (tbl.c.id == bsid) &
+                ((tbl.c.complete == None) | (tbl.c.complete != 1))))
+            res = conn.execute(q,
+                complete=1,
+                results=results,
+                complete_at=_reactor.seconds())
+
+            if res.rowcount != 1:
+                raise KeyError
+        return self.db.pool.do(thd)
+
     def getBuildset(self, bsid):
         """
         Get a dictionary representing the given buildset, or None

master/buildbot/test/unit/test_db_buildsets.py

@@ -26,6 +26,10 @@ class TestBuildsetsConnectorComponent(
             unittest.TestCase):
 
     def setUp(self):
+        self.now = 9272359
+        self.clock = task.Clock()
+        self.clock.advance(self.now)
+
         d = self.setUpConnectorComponent(
             table_names=[ 'patches', 'changes', 'sourcestamp_changes',
                 'buildsets', 'buildset_properties', 'schedulers',
@@ -48,15 +52,11 @@ def tearDown(self):
     # tests
 
     def test_addBuildset_simple(self):
-        now = 9272359
-        clock = task.Clock()
-        clock.advance(now)
-
         d = defer.succeed(None)
         d.addCallback(lambda _ :
             self.db.buildsets.addBuildset(ssid=234, reason='because',
                 properties={}, builderNames=['bldr'], external_idstring='extid',
-                _reactor=clock))
+                _reactor=self.clock))
         def check((bsid, brids)):
             def thd(conn):
                 # we should only have one brid
@@ -68,7 +68,7 @@ def thd(conn):
                           row.sourcestampid, row.complete, row.complete_at,
                           row.submitted_at, row.results) for row in r.fetchall() ]
                 self.assertEqual(rows,
-                    [ ( bsid, 'extid', 'because', 234, 0, None, now, -1) ])
+                    [ ( bsid, 'extid', 'because', 234, 0, None, self.now, -1) ])
 
                 # and one buildrequests row
                 r = conn.execute(self.db.model.buildrequests.select())
@@ -80,7 +80,7 @@ def thd(conn):
                           for row in r.fetchall() ]
                 self.assertEqual(rows,
                     [ ( bsid, brids['bldr'], 'bldr', 0, 0, None, None, 0,
-                        -1, now, None) ])
+                        -1, self.now, None) ])
             return self.db.pool.do(thd)
         d.addCallback(check)
         return d
@@ -397,3 +397,47 @@ def check(bsdictlist):
         d.addCallback(check)
         return d
 
+    def test_completeBuildset(self):
+        d = self.insert_test_getBuildsets_data()
+        d.addCallback(lambda _ :
+                self.db.buildsets.completeBuildset(bsid=91, results=6,
+                                                   _reactor=self.clock))
+        def check(_):
+            def thd(conn):
+                # should see one buildset row
+                r = conn.execute(self.db.model.buildsets.select())
+                rows = [ (row.id, row.complete, row.complete_at, row.results)
+                         for row in r.fetchall() ]
+                self.assertEqual(sorted(rows), sorted([
+                    ( 91, 1, self.now, 6),
+                    ( 92, 1, 298297876, 7) ]))
+            return self.db.pool.do(thd)
+        d.addCallback(check)
+        return d
+
+    def test_completeBuildset_already_completed(self):
+        d = self.insert_test_getBuildsets_data()
+        d.addCallback(lambda _ :
+                self.db.buildsets.completeBuildset(bsid=92, results=6,
+                                                   _reactor=self.clock))
+        def cb(_):
+            self.fail("should not succeed")
+        def eb(f):
+            f.trap(KeyError)
+            # pass
+        d.addCallbacks(cb, eb)
+        return d
+
+    def test_completeBuildset_missing(self):
+        d = self.insert_test_getBuildsets_data()
+        d.addCallback(lambda _ :
+                self.db.buildsets.completeBuildset(bsid=93, results=6,
+                                                   _reactor=self.clock))
+        def cb(_):
+            self.fail("should not succeed")
+        def eb(f):
+            f.trap(KeyError)
+            # pass
+        d.addCallbacks(cb, eb)
+        return d
+