Ticket #228: 228-step-statistics.patch

old-dustin/buildbot/status/builder.py

@@ -449 +449 @@
-            self.finish() # releases self.openfile, which will be closed
-        del self.entries
-
-
-class HTMLLogFile:
-    implements(interfaces.IStatusLog)
-
@@ -642 +641 @@
-    I represent a collection of output status for a
-    L{buildbot.process.step.BuildStep}.
-
+    Statistics contain any information gleaned from a step that is
+    not in the form of a logfile.  As an example, steps that run
+    tests might gather statistics about the number of passed, failed,
+    or skipped tests.
+
-    @type color: string
-    @cvar color: color that this step feels best represents its
-                 current mood. yellow,green,red,orange are the
@@ -655 +659 @@
-    @cvar text2: list of short texts added to the overall build description
-    @type logs: dict of string -> L{buildbot.status.builder.LogFile}
-    @ivar logs: logs of steps
+    @type statistics: dict
+    @ivar statistics: results from running this step
-    """
-    # note that these are created when the Build is set up, before each
-    # corresponding BuildStep has started.
-    implements(interfaces.IBuildStepStatus, interfaces.IStatusEvent)
-1
+2
-
-    started = None
-    finished = None
@@ -671 +677 @@
-    watchers = []
-    updates = {}
-    finishedWatchers = []
+    statistics = {}
-
-    def __init__(self, parent):
-        assert interfaces.IBuildStatus(parent)
@@ -680 +687 @@
-        self.watchers = []
-        self.updates = {}
-        self.finishedWatchers = []
+        self.statistics = {}
-
-    def getName(self):
-        """Returns a short string with the name of this step. This string
@@ -764 +772 @@
-        """
-        return (self.results, self.text2)
-
+    def hasStatistic(self, name):
+        """Return true if this step has a value for the given statistic.
+        """
+        return self.statistics.has_key(name)
+
+    def getStatistic(self, name, default=None):
+        """Return the given statistic, if present
+        """
+        return self.statistics.get(name, default)
+
-    # subscription interface
-
-    def subscribe(self, receiver, updateInterval=10):
@@ -847 +865 @@
-    def setText2(self, text):
-        self.text2 = text
-
+    def setStatistic(self, name, value):
+        """Set the given statistic.  Usually called by subclasses.
+        """
+        self.statistics[name] = value
+
-    def stepFinished(self, results):
-        self.finished = util.now()
-        self.results = results
@@ -886 +909 @@
-        if not hasattr(self, "urls"):
-            self.urls = {}
-
+    def upgradeToVersion2(self):
+        if not hasattr(self, "statistics"):
+            self.statistics = {}
+
-
-class BuildStatus(styles.Versioned):
-    implements(interfaces.IBuildStatus, interfaces.IStatusEvent)
@@ -978 +1005 @@
-    def getTimes(self):
-        return (self.started, self.finished)
-
+    _sentinel = [] # used as a sentinel to indicate unspecified initial_value
+    def getSummaryStatistic(self, name, summary_fn, initial_value=_sentinel):
+        """Summarize the named statistic over all steps in which it
+        exists, using combination_fn and initial_value to combine multiple
+        results into a single result.  This translates to a call to Python's
+        X{reduce}::
+            return reduce(summary_fn, step_stats_list, initial_value)
+        """
+        step_stats_list = [
+                st.getStatistic(name)
+                for st in self.steps
+                if st.hasStatistic(name) ]
+        if initial_value is self._sentinel:
+            return reduce(summary_fn, step_stats_list)
+        else:
+            return reduce(summary_fn, step_stats_list, initial_value)
+
-    def isFinished(self):
-        return (self.finished is not None)
-

old-dustin/buildbot/test/test_status.py

@@ -1 +1 @@
-# -*- test-case-name: buildbot.test.test_status -*-
-
-import email, os
+import operator
-
-from zope.interface import implements
-from twisted.internet import defer, reactor
@@ -1194 +1195 @@
-
-    def send(self, msg):
-        self.message += msg
+
+class StepStatistics(unittest.TestCase):
+    def testStepStatistics(self):
+        status = builder.BuildStatus(builder.BuilderStatus("test"), 123)
+        status.addStepWithName('step1')
+        status.addStepWithName('step2')
+        status.addStepWithName('step3')
+        status.addStepWithName('step4')
+
+        steps = status.getSteps()
+        (step1, step2, step3, step4) = steps
+
+        step1.setStatistic('test-prop', 1)
+        step3.setStatistic('test-prop', 2)
+        step4.setStatistic('test-prop', 4)
+
+        step1.setStatistic('other-prop', 27)
+        # Just to have some other properties around
+
+        self.failUnlessEqual(step1.getStatistic('test-prop'), 1,
+            'Retrieve an existing property')
+        self.failUnlessEqual(step1.getStatistic('test-prop', 99), 1,
+            "Don't default an existing property")
+        self.failUnlessEqual(step2.getStatistic('test-prop', 99), 99,
+            'Default a non-existant property')
+
+        self.failUnlessEqual(
+            status.getSummaryStatistic('test-prop', operator.add), 7,
+            'Sum property across the build')
+
+        self.failUnlessEqual(
+            status.getSummaryStatistic('test-prop', operator.add, 13), 20,
+            'Sum property across the build with initial value')