improved subunit support:

properly report how many tests are executed if success, otherwise how
many error/fail tests

master/buildbot/process/subunitlogobserver.py

@@ -2,13 +2,7 @@
 
 from unittest import TestResult
 from buildbot.process import buildstep
-
-class DiscardStream:
-    """A trivial thunk used to discard passthrough content."""
-
-    def write(self, bytes):
-        pass
-
+from StringIO import StringIO
 
 class SubunitLogObserver(buildstep.LogLineObserver, TestResult):
     """Observe a log that may contain subunit output.
@@ -25,17 +19,30 @@ def __init__(self):
         except ImportError:
             raise ImportError("subunit is not importable, but is required for "
                 "SubunitLogObserver support.")
-        self.protocol = TestProtocolServer(self, DiscardStream())
+        self.warningio = StringIO()
+        self.protocol = TestProtocolServer(self, self.warningio)
+        self.skips = []
+        self.seen_tags = set() #don't yet know what tags does in subunit
 
     def outLineReceived(self, line):
-        """Process a received line."""
+        """Process a received stdout line."""
         # Impedance mismatch: subunit wants lines, observers get lines-no\n
         self.protocol.lineReceived(line + '\n')
 
+    def errLineReceived(self, line):
+        """same for stderr line."""
+        self.protocol.lineReceived(line + '\n')
+
     def startTest(self, test):
         TestResult.startTest(self, test)
         self.step.setProgress('tests', self.testsRun)
 
+    def addSkip(self, test, detail):
+        if hasattr(TestResult,'addSkip'):
+            TestResult.addSkip(self, test, detail)
+        else:
+            self.skips.append((test, detail))
+
     def addError(self, test, err):
         TestResult.addError(self, test, err)
         self.issue()
@@ -46,7 +53,12 @@ def addFailure(self, test, err):
 
     def issue(self):
         """An issue - failing, erroring etc test."""
-        self.step.setProgress('tests failed', len(self.failures) + len(self.errors))
+        self.step.setProgress('tests failed', len(self.failures) + 
+            len(self.errors))
+
+    def tags(self, new_tags, gone_tags):
+        """Accumulate the seen tags."""
+        self.seen_tags.update(new_tags)
 
 # this used to be referenced here, so we keep a link for old time's sake
 import buildbot.steps.subunit

master/buildbot/steps/subunit.py

@@ -1,15 +1,79 @@
 
 from buildbot.steps.shell import ShellCommand
+from buildbot.status.builder import SUCCESS, FAILURE, WARNINGS, SKIPPED
 
 class SubunitShellCommand(ShellCommand):
     """A ShellCommand that sniffs subunit output.
-
-    Ideally not needed, and thus here to be trivially deleted. See issue #615
     """
 
     def __init__(self, *args, **kwargs):
         ShellCommand.__init__(self, *args, **kwargs)
         # importing here gets around an import loop
         from buildbot.process import subunitlogobserver
-        self.addLogObserver('stdio', subunitlogobserver.SubunitLogObserver())
+        self.ioObverser = subunitlogobserver.SubunitLogObserver()
+        self.addLogObserver('stdio', self.ioObverser)
         self.progressMetrics = self.progressMetrics + ('tests', 'tests failed')
+    def commandComplete(self, cmd):
+        # figure out all statistics about the run
+        ob = self.ioObverser
+        failures = len(ob.failures)
+        errors = len(ob.errors)
+        skips = len(ob.skips)
+        total = ob.testsRun
+
+        count = failures + errors
+
+        text = []
+        text2 = ""
+
+        if not count:
+            results = SUCCESS
+            if total:
+                text += ["%d %s" % \
+                          (total,
+                          total == 1 and "test" or "tests"),
+                          "passed"]
+            else:
+                text += ["no tests", "run"]
+        else:
+            results = FAILURE
+            text.append("tests")
+            if failures:
+                text.append("%d %s" % \
+                            (failures,
+                             failures == 1 and "failure" or "failures"))
+            if errors:
+                text.append("%d %s" % \
+                            (errors,
+                             errors == 1 and "error" or "errors"))
+            text2 = "%d tes%s" % (count, (count == 1 and 't' or 'ts'))
+
+
+        if skips:
+            text.append("%d %s" %  (skips,
+                         skips == 1 and "skip" or "skips"))
+
+        #TODO: expectedFailures/unexpectedSuccesses
+
+        self.results = results
+        self.text = text
+        self.text2 = [text2]
+
+    def evaluateCommand(self, cmd):
+        return self.results
+
+    def createSummary(self, loog):
+        ob = self.ioObverser
+        problems = ""
+        for test, err in ob.errors + ob.failures:
+            problems += "%s\n%s" % (test, err)
+        if problems:
+            self.addCompleteLog("problems", problems)
+        warnings = ob.warningio.getvalue()
+        if warnings:
+            self.addCompleteLog("warnings", warnings)
+
+    def getText(self, cmd, results):
+        return self.text
+    def getText2(self, cmd, results):
+        return self.text2