Ticket #228: 228.patch

old-dustin/buildbot/process/factory.py

@@ -4 +4 @@
-from buildbot.process.base import Build
-from buildbot.process.buildstep import BuildStep
-from buildbot.steps.source import CVS, SVN
-
+, PerlModuleTest
-
-# deprecated, use BuildFactory.addStep
-def s(steptype, **kwargs):
@@ -81 +81 @@
-        BuildFactory.__init__(self, [source])
-        self.addStep(Configure, command=[perl, "Makefile.PL"])
-        self.addStep(Compile, command=["make"])
-
+PerlModule
-
-class Distutils(BuildFactory):
-    def __init__(self, source, python="python", test=None):

old-dustin/buildbot/status/web/waterfall.py

@@ -110 +110 @@
-        number = b.getNumber()
-        url = path_to_build(req, b)
-        text = b.getText()
+        tests_failed = b.sumStepProperty('tests-failed')
+        if tests_failed: text.extend(["Failed tests: %d" % tests_failed])
-        # TODO: maybe add logs?
-        # TODO: add link to the per-build page at 'url'
-        c = b.getColor()

old-dustin/buildbot/steps/shell.py

@@ -425 +425 @@
-            return [ word + " (" + filter + ")" ]
-        else:
-            return [ word ]
+
+class PerlModuleTest(Test):
+    command=["prove", "--lib", "lib", "-r", "t"]
+
+    def evaluateCommand(self, cmd):
+        lines = self.getLog('stdio').readlines()
+
+        re_test_result = re.compile("^(All tests successful)|(\d+)/(\d+) subtests failed|Files=\d+, Tests=(\d+),")
+
+        mos = map(lambda line: re_test_result.search(line), lines)
+        test_result_lines = [mo.groups() for mo in mos if mo]
+
+        if not test_result_lines:
+            return cmd.rc
+
+        test_result_line = test_result_lines[0]
+
+        success = test_result_line[0]
+
+        if success:
+            failed = 0
+
+            test_totals_line = test_result_lines[1]
+            total_str = test_totals_line[3]
+
+            rc = SUCCESS
+        else:
+            failed_str = test_result_line[1]
+            failed = int(failed_str)
+
+            total_str = test_result_line[2]
+
+            rc = FAILURE
+
+        total = int(total_str)
+        passed = total - failed
+
+        self.setStepProperty('tests-total', total)
+        self.setStepProperty('tests-failed', failed)
+        self.setStepProperty('tests-passed', passed)
+
+        self.warnings = failed
+
+        return rc

old-dustin/buildbot/test/test_steps.py

@@ -639 +639 @@
-                                 "treesize %d KiB" % kib)
-        d.addCallback(_check)
-        return d
+
+class PerlModuleTest(StepTester, unittest.TestCase):
+    def testAllTestsPassed(self):
+        self.masterbase = "Warnings.testAllTestsPassed"
+        step = self.makeStep(shell.PerlModuleTest)
+        output = \
+"""ok 1
+ok 2
+All tests successful
+Files=1, Tests=123, other stuff
+"""
+        log = step.addLog("stdio")
+        log.addStdout(output)
+        log.finish()
+        step.evaluateCommand(log)
+        self.failUnlessEqual(step.getStepProperty('tests-failed'), 0)
+        self.failUnlessEqual(step.getStepProperty('tests-total'), 123)
+        self.failUnlessEqual(step.getStepProperty('tests-passed'), 123)
+
+    def testFailures(self):
+        self.masterbase = "Warnings.testFailures"
+        step = self.makeStep(shell.PerlModuleTest)
+        output = \
+"""
+ok 1
+ok 2
+3/7 subtests failed
+"""
+        log = step.addLog("stdio")
+        log.addStdout(output)
+        log.finish()
+        step.evaluateCommand(log)
+        self.failUnlessEqual(step.getStepProperty('tests-failed'), 3)
+        self.failUnlessEqual(step.getStepProperty('tests-total'), 7)
+        self.failUnlessEqual(step.getStepProperty('tests-passed'), 4)

old-dustin/docs/buildbot.texinfo

@@ -4927 +4927 @@
-* Compile::                     
-* Test::                        
-* TreeSize::                    
+* PerlModuleTest::
-* SetProperty::                    
-* Build Properties::            
-@end menu
@@ -4994 +4995 @@
-aka 'KiB' or 'kibibytes') on the step's status text, and sets a build
-property named 'tree-size-KiB' with the same value.
-
+@node PerlModuleTest, Build Properties, TreeSize, Simple ShellCommand Subclasses
+@subsubsection PerlModuleTest
+
+@bsindex buildbot.steps.shell.PerlModuleTest
+
+This is a simple command that knows how to run tests of perl modules.
+It parses the output to determine the number of tests passed and
+failed and total number executed, saving the results for later query.
+
-@node SetProperty
-@subsubsection SetProperty
-