[Buildbot-commits] buildbot/buildbot/steps shell.py,1.29,1.30

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16530/buildbot/steps

Modified Files:
	shell.py 
Log Message:
[project @ shell.Test: improve summary text by including description from the parent class]

Original author: warner at lothar.com
Date: 2008-07-24 22:44:01+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- shell.py	24 Jul 2008 01:35:38 -0000	1.29
+++ shell.py	24 Jul 2008 23:00:52 -0000	1.30
@@ -383,6 +383,7 @@
         self.step_status.setStatistic('tests-passed', passed)
 
     def getText(self, cmd, results):
+        text = WarningCountingShellCommand.getText(self, cmd, results)
         if self.step_status.hasStatistic('tests-total'):
             total = self.step_status.getStatistic("tests-total", 0)
             failed = self.step_status.getStatistic("tests-failed", 0)
@@ -391,14 +392,15 @@
             if not total:
                 total = failed + passed + warnings
 
-            rv = []
-            if total: rv.append('%d tests' % total)
-            if passed: rv.append('%d passed' % passed)
-            if warnings: rv.append('%d warnings' % warnings)
-            if failed: rv.append('%d failed' % failed)
-            return rv
-        else:
-            return [ "no test results" ]
+            if total:
+                text.append('%d tests' % total)
+            if passed:
+                text.append('%d passed' % passed)
+            if warnings:
+                text.append('%d warnings' % warnings)
+            if failed:
+                text.append('%d failed' % failed)
+        return text
 
 class PerlModuleTest(Test):
     command=["prove", "--lib", "lib", "-r", "t"]