[pypy-svn] r59012 - in pypy/build/bot2/pypybuildbot: . test

[pedronis at codespeak.net]

Author: pedronis
Date: Sun Oct 12 11:13:20 2008
New Revision: 59012

Modified:
   pypy/build/bot2/pypybuildbot/summary.py
   pypy/build/bot2/pypybuildbot/test/test_summary.py
Log:
(hpk, pedronis)

show the number of passed tests too



Modified: pypy/build/bot2/pypybuildbot/summary.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/summary.py	(original)
+++ pypy/build/bot2/pypybuildbot/summary.py	Sun Oct 12 11:13:20 2008
@@ -39,6 +39,10 @@
         if longrepr:
             self.longreprs[namekey] = longrepr
 
+    @property
+    def numpassed(self):
+        return len(self._outcomes) - len(self.skipped) - len(self.failed)
+
     def populate(self, log):
         kind = None
         def add_one():
@@ -133,6 +137,7 @@
         self.map = map
         self._failed = None
         self._skipped = None
+        self._numpassed = None
         self.revision = map.values()[0].revision
         
     @property
@@ -153,6 +158,15 @@
                                      outcome.skipped])
         return self._skipped
 
+    @property
+    def numpassed(self):
+        if self._numpassed is None:
+            numpassed = 0
+            for  prefix, outcome in self.map.items():
+                numpassed += outcome.numpassed
+            self._numpassed = numpassed
+        return self._numpassed
+
     def get_outcome(self, namekey):
         which = namekey[0]
         if which not in self.map:
@@ -211,9 +225,10 @@
         for cachekey, (run, url) in stdios:
             builder = cachekey[0]
             anchors.append('  ')
-            text = "%s [%d failed; %d skipped]" % (builder,
-                                                   len(run.failed),
-                                                   len(run.skipped))
+            text = "%s [%d, %d F, %d s]" % (builder,
+                                            run.numpassed,
+                                            len(run.failed),
+                                            len(run.skipped))
             anchors.append(html.a(text, href=url))
         return anchors
 

Modified: pypy/build/bot2/pypybuildbot/test/test_summary.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/test/test_summary.py	(original)
+++ pypy/build/bot2/pypybuildbot/test/test_summary.py	Sun Oct 12 11:13:20 2008
@@ -18,6 +18,7 @@
 
         assert rev_outcome_set.skipped == set([("a.b","test_three")])
         assert rev_outcome_set.failed == set([("a.b", "test_one")])
+        assert rev_outcome_set.numpassed == 1
 
         res = rev_outcome_set.get_outcome(("a.b", "test_one"))
         assert res == 'F'
@@ -51,6 +52,7 @@
 
         assert len(rev_outcome_set.skipped) == 1
         assert len(rev_outcome_set.failed) == 1
+        assert rev_outcome_set.numpassed == 1
 
         assert rev_outcome_set.longreprs == {
 ("a.b","test_three"): "some skip\n",
@@ -80,6 +82,8 @@
 
         assert rev_outcome_set.skipped == set([
             ("a.c", '')])
+
+        assert rev_outcome_set.numpassed == 0
         
     def test_absent_outcome(self):
         rev_outcome_set = summary.RevisionOutcomeSet(50000)
@@ -162,6 +166,7 @@
         assert goutcome.skipped == set([('foo', 'a.b', 'test_three'),
                                         ('bar', 'a.b', 'test_three'),
                                         ])
+        assert goutcome.numpassed == 3
 
         for prefix in ('foo', 'bar'):
             for mod, testname in (("a.b", "test_one"), ("a.b", "test_two"),
@@ -182,6 +187,8 @@
 
         assert goutcome_top.failed == set([('sub', 'foo', 'a.b', 'test_one')])
 
+        assert goutcome_top.numpassed == 3
+
         res = goutcome_top.get_outcome(('sub', 'foo', 'a.b', 'test_one'))
         assert res == 'F'