Ticket #228: perl_module_test.darcs_diff

{
hunk ./buildbot/process/buildstep.py 635
+    def getPropertyOrDefault(self, propname, default):
+        return self.build.getPropertyOrDefault(propname, default)
+
hunk ./buildbot/process/buildstep.py 641
+    def getStepProperty(self, propname):
+        return self.step_status.getStepProperty(propname)
+
+    def getStepPropertyOrDefault(self, propname, default):
+        return self.step_status.getStepPropertyOrDefault(propname, default)
+
+    def setStepProperty(self, propname, value):
+        self.step_status.setStepProperty(propname, value)
+
hunk ./buildbot/process/factory.py 7
-from buildbot.steps.shell import Configure, Compile, Test
+from buildbot.steps.shell import Configure, Compile, Test, PerlModuleTest
hunk ./buildbot/process/factory.py 84
-        self.addStep(Test, command=["make", "test"])
+        self.addStep(PerlModuleTest, command=["make", "test"])
hunk ./buildbot/status/builder.py 673
+    properties = {}
hunk ./buildbot/status/builder.py 683
+        self.properties = {}
hunk ./buildbot/status/builder.py 711
+    def getStepProperty(self, propname):
+        return self.properties[propname]
+
+    def getStepPropertyOrDefault(self, propname, default):
+        if self.properties.has_key(propname):
+            return self.properties[propname]
+        else:
+            return default
+
hunk ./buildbot/status/builder.py 813
+    def setStepProperty(self, propname, value):
+        self.properties[propname] = value
+
hunk ./buildbot/status/builder.py 903
+import operator
+
hunk ./buildbot/status/builder.py 956
+    def getPropertyOrDefault(self, propname, default):
+        if self.properties.has_key(propname):
+            return self.properties[propname]
+        else:
+            return default
+
hunk ./buildbot/status/builder.py 1048
+    def sumStepProperty(self, propname):
+        return reduce(operator.add, map(lambda x: x.getStepPropertyOrDefault(propname, 0), self.steps))
+
hunk ./buildbot/status/web/waterfall.py 113
+        tests_failed = b.sumStepProperty('tests-failed')
+        if tests_failed: text.extend(["Failed tests: %d" % tests_failed])
hunk ./buildbot/steps/shell.py 338
+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
+
hunk ./buildbot/test/test_status.py 984
+class Properties(unittest.TestCase):
+    def testProperties(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.setStepProperty('test-prop', 1)
+        step1.setStepProperty('other-prop', 27) # Just to have some other properties around
+        step3.setStepProperty('test-prop', 2)
+        step4.setStepProperty('test-prop', 4)
+
+        self.failUnlessEqual(step1.getStepProperty('test-prop'), 1, 'Retrieve an existing property')
+        self.failUnlessEqual(step1.getStepPropertyOrDefault('test-prop', 99), 1, 'Don\'t default an existing property')
+        self.failUnlessEqual(step2.getStepPropertyOrDefault('test-prop', 99), 99, 'Default a non-existant property')
+
+        self.failUnlessEqual( status.sumStepProperty('test-prop'), 7, 'Sum property across the build')
+
hunk ./buildbot/test/test_steps.py 643
+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)
+
hunk ./docs/buildbot.texinfo 4478
+* PerlModuleTest::
hunk ./docs/buildbot.texinfo 4535
-@node TreeSize, Build Properties, Test, Simple ShellCommand Subclasses
+@node TreeSize, PerlModuleTest, Test, Simple ShellCommand Subclasses
hunk ./docs/buildbot.texinfo 4545
+@node PerlModuleTest, Build Properties, TreeSize, Simple ShellCommand Subclasses
+@subsubsection PerlModuleTest
hunk ./docs/buildbot.texinfo 4548
-@node Build Properties,  , TreeSize, Simple ShellCommand Subclasses
+@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 Build Properties,  , PerlModuleTest, Simple ShellCommand Subclasses
}