[Buildbot-commits] buildbot/buildbot/test test_steps.py,1.49,1.50

[Brian Warner]

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

Modified Files:
	test_steps.py 
Log Message:
[project @ 	* buildbot/steps/shell.py (Test.setTestResults): set statistics]
	with names like "tests-total" instead of just "total".
	(Test.getText): same
	* buildbot/test/test_steps.py (PerlModuleTest): use
	getStatistic (with "tests-total") instead of getProperty, and call
	it on the step_status, not the step itself. This pair makes the
	PerlModuleTest pass again


Original author: warner at lothar.com
Date: 2008-07-24 00:20:05+00:00

Index: test_steps.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_steps.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- test_steps.py	27 May 2008 00:52:29 -0000	1.49
+++ test_steps.py	24 Jul 2008 00:57:56 -0000	1.50
@@ -654,9 +654,10 @@
         log.addStdout(output)
         log.finish()
         step.evaluateCommand(log)
-        self.failUnlessEqual(step.getProperty('tests-failed'), 0)
-        self.failUnlessEqual(step.getProperty('tests-total'), 123)
-        self.failUnlessEqual(step.getProperty('tests-passed'), 123)
+        ss = step.step_status
+        self.failUnlessEqual(ss.getStatistic('tests-failed'), 0)
+        self.failUnlessEqual(ss.getStatistic('tests-total'), 123)
+        self.failUnlessEqual(ss.getStatistic('tests-passed'), 123)
 
     def testFailures(self):
         self.masterbase = "Warnings.testFailures"
@@ -671,6 +672,7 @@
         log.addStdout(output)
         log.finish()
         step.evaluateCommand(log)
-        self.failUnlessEqual(step.getProperty('tests-failed'), 3)
-        self.failUnlessEqual(step.getProperty('tests-total'), 7)
-        self.failUnlessEqual(step.getProperty('tests-passed'), 4)
+        ss = step.step_status
+        self.failUnlessEqual(ss.getStatistic('tests-failed'), 3)
+        self.failUnlessEqual(ss.getStatistic('tests-total'), 7)
+        self.failUnlessEqual(ss.getStatistic('tests-passed'), 4)