[pypy-svn] r60731 - pypy/build/bot2/pypybuildbot

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Dec 29 20:15:56 2008
New Revision: 60731

Modified:
   pypy/build/bot2/pypybuildbot/summary.py
Log:
oops, remove exra copy of test

Modified: pypy/build/bot2/pypybuildbot/summary.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/summary.py	(original)
+++ pypy/build/bot2/pypybuildbot/summary.py	Mon Dec 29 20:15:56 2008
@@ -261,7 +261,10 @@
         branch_anchor = html.a(branch, href="/summary?branch=%s" % branch)
         self.sections.append(html.h2(branch_anchor))
 
-    def _rev_anchor(self, rev):
+    def _label(self, outcome_set):
+        return outcome_set.revision
+
+    def _label_anchor(self, rev):
         rev_anchor = html.a(str(rev), href="/summary?branch=%s&recentrev=%d" %
                             (self.cur_branch, rev))
         return rev_anchor
@@ -269,18 +272,18 @@
     def add_section(self, outcome_sets):
         if not outcome_sets:
             return
-        revs = sorted(outcome_set.revision for outcome_set in outcome_sets)
-        by_rev = sorted((outcome_set.revision, outcome_set) for outcome_set
+        labels = sorted(self._label(outcome_set) for outcome_set in outcome_sets)
+        by_label = sorted((self._label(outcome_set), outcome_set) for outcome_set
                          in outcome_sets)
         lines = []
 
-        align = 2*len(revs)-1+len(str(revs[-1]))
+        align = 2*len(labels)-1+len(str(labels[-1]))
         def bars():
             return ' |'*len(lines)
-        for rev, outcome_set in by_rev:
+        for label, outcome_set in by_label:
             count_failures = len(outcome_set.failed)
             count_skipped = len(outcome_set.skipped)
-            line = [bars(), ' ', self._rev_anchor(rev)]
+            line = [bars(), ' ', self._label_anchor(label)]
             line.append((align-len(line[0]))*" ")
             line.append(self.make_stdio_anchors_for(outcome_set))
             line.append('\n')
@@ -289,7 +292,7 @@
         
         failed = set()
         exploded = set()
-        for rev, outcome_set in by_rev:
+        for label, outcome_set in by_label:
             for failure in outcome_set.failed:
                 letter = outcome_set.get_outcome(failure)
                 if letter == '!':
@@ -303,7 +306,7 @@
 
         for failure in sorted(failed, key=sorting):
             line = []
-            for rev, outcome_set in by_rev:
+            for label, outcome_set in by_label:
                 letter = outcome_set.get_outcome(failure)
                 failed = letter not in ('s', '.')
                 if outcome_set.get_longrepr(failure):