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

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Sep 16 09:50:29 2008
New Revision: 58175

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

longer, clearer naming



Modified: pypy/build/bot2/pypybuildbot/summary.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/summary.py	(original)
+++ pypy/build/bot2/pypybuildbot/summary.py	Tue Sep 16 09:50:29 2008
@@ -2,7 +2,7 @@
 from buildbot.status.web.base import HtmlResource
 
 # xxx caching?
-class RevOutcome(object):
+class RevisionOutcomeSet(object):
 
     def __init__(self, rev):
         self.rev = rev
@@ -12,7 +12,7 @@
         # xxx failure tracebacks
 
     def populate_one(self, name, shortrepr):
-        namekey = name.split(':', 1)
+        namekey = name.split(':', 1) # xxx not always the correct thing
         if namekey[0].endswith('.py'):
             namekey[0] = namekey[0][:-3].replace('/', '.')
 
@@ -37,7 +37,7 @@
         return self._outcomes[namekey]
 
 
-class GatherOutcome(object):
+class GatherOutcomeSet(object):
 
     def __init__(self, map):
         self.map = map
@@ -85,7 +85,7 @@
                     # the log is there
                     log = [log for log in build.getLogs()
                            if log.getName() == "pytestLog"][0]
-                    revBuilds[builderName] = RevOutcome(log)
+                    revBuilds[builderName] = RevisionOutcomeSet(log)
         revs = revs.items()
         revs.sort()
         return revs

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	Tue Sep 16 09:50:29 2008
@@ -4,49 +4,49 @@
 class TestOutcomes(object):
 
     def test_populate(self):
-        rev_outcome = summary.RevOutcome(50000)
+        rev_outcome_set = summary.RevisionOutcomeSet(50000)
         log = StringIO("""F a/b.py:test_one
 . a/b.py:test_two
 s a/b.py:test_three
 """)
         
-        rev_outcome.populate(log)
+        rev_outcome_set.populate(log)
 
-        assert rev_outcome.skipped == set([("a.b","test_three")])
-        assert rev_outcome.failed == set([("a.b", "test_one")])
+        assert rev_outcome_set.skipped == set([("a.b","test_three")])
+        assert rev_outcome_set.failed == set([("a.b", "test_one")])
 
-        res = rev_outcome.get_outcome(("a.b", "test_one"))
+        res = rev_outcome_set.get_outcome(("a.b", "test_one"))
         assert res == 'F'
 
-        res = rev_outcome.get_outcome(("a.b", "test_three"))
+        res = rev_outcome_set.get_outcome(("a.b", "test_three"))
         assert res == 's'
 
-        res = rev_outcome.get_outcome(("a.b", "test_two"))
+        res = rev_outcome_set.get_outcome(("a.b", "test_two"))
         assert res == '.'
 
 
-    def test_GatherOutcome(self):
-        rev_outcome_foo = summary.RevOutcome(50000)
+    def test_GatherOutcomeSet(self):
+        rev_outcome_set_foo = summary.RevisionOutcomeSet(50000)
         log = StringIO("""F a/b.py:test_one
 . a/b.py:test_two
 s a/b.py:test_three
 """)
         
-        rev_outcome_foo.populate(log)
+        rev_outcome_set_foo.populate(log)
 
         
-        rev_outcome_bar = summary.RevOutcome(50000)
+        rev_outcome_set_bar = summary.RevisionOutcomeSet(50000)
         log = StringIO(""". a/b.py:test_one
 . a/b.py:test_two
 s a/b.py:test_three
 """)
         
-        rev_outcome_bar.populate(log)
+        rev_outcome_set_bar.populate(log)
 
-        d = {'foo': rev_outcome_foo,
-             'bar': rev_outcome_bar}
+        d = {'foo': rev_outcome_set_foo,
+             'bar': rev_outcome_set_bar}
 
-        goutcome = summary.GatherOutcome(d)
+        goutcome = summary.GatherOutcomeSet(d)
 
         
         assert goutcome.failed == set([('foo', 'a.b', 'test_one')])
@@ -67,7 +67,7 @@
                 outcome2 = goutcome.get_outcome((prefix, mod, testname))
                 assert outcome2 == outcome1
 
-        goutcome_top = summary.GatherOutcome({'sub': goutcome})
+        goutcome_top = summary.GatherOutcomeSet({'sub': goutcome})
 
         assert goutcome_top.failed == set([('sub', 'foo', 'a.b', 'test_one')])