[pypy-svn] buildbot default: fix regression showing wrong columns for pytest2-run tests

[hpk42]

Author: holger krekel <holger at merlinux.eu>
Branch: 
Changeset: r446:4cd435c048d2
Date: 2011-03-09 11:56 +0100
http://bitbucket.org/pypy/buildbot/changeset/4cd435c048d2/

Log:	fix regression showing wrong columns for pytest2-run tests

diff --git a/bot2/pypybuildbot/summary.py b/bot2/pypybuildbot/summary.py
--- a/bot2/pypybuildbot/summary.py
+++ b/bot2/pypybuildbot/summary.py
@@ -67,12 +67,18 @@
     def populate_one(self, name, shortrepr, longrepr=None):
         if shortrepr == '!':
             namekey = [name, '']
-        else:        
-            namekey = name.split(':', 1)
+        else:
+            # pytest2 and pytest1 use different separators/test id
+            # syntax support both here for now
+            if '.py::' in name:
+                namekey = name.split('::', 1)
+            else:
+                namekey = name.split(':', 1)
             if namekey[0].endswith('.py'):
                 namekey[0] = namekey[0][:-3].replace('/', '.')
             if len(namekey) == 1:
                 namekey.append('')
+            namekey[1] = namekey[1].replace("::", ".")
 
         namekey = tuple(namekey)
         self._outcomes[namekey] = shortrepr
@@ -106,7 +112,7 @@
         kind = None
         def add_one():
             if kind is not None:
-                self.populate_one(name, kind, ''.join(longrepr))        
+                self.populate_one(name, kind, ''.join(longrepr))
         for line in log.readlines():
             first = line[0]
             if first == ' ':
@@ -570,7 +576,7 @@
         mod, testname = self.get_namekey(request)
         if mod is None:
             return "no such test"
-        return "%s %s" % (mod, testname)        
+        return "%s %s" % (mod, testname)
 
     def body(self, request):
         t0 = time.time()
@@ -660,7 +666,7 @@
             request.site.buildbot_service.head_elements = old_head_elements
 
     def getTitle(self, request):
-        status = self.getStatus(request)        
+        status = self.getStatus(request)
         return "%s: summaries of last %d revisions" % (status.getProjectName(),
                                                        N)