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

[pedronis at codespeak.net]

Author: pedronis
Date: Wed Mar 18 10:27:40 2009
New Revision: 63025

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

deal with the new 'S' vs 's' distinction



Modified: pypy/build/bot2/pypybuildbot/summary.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/summary.py	(original)
+++ pypy/build/bot2/pypybuildbot/summary.py	Wed Mar 18 10:27:40 2009
@@ -46,7 +46,7 @@
 
         namekey = tuple(namekey)
         self._outcomes[namekey] = shortrepr
-        if shortrepr == 's':
+        if shortrepr.lower() == 's':
             self.skipped.add(namekey)
         elif shortrepr == '.':
             pass
@@ -403,7 +403,7 @@
             line = []
             for label, outcome_set in by_label:
                 letter = outcome_set.get_outcome(failure)
-                failed = letter not in ('s', '.')
+                failed = letter.lower() not in ('s', '.')
                 if outcome_set.get_longrepr(failure):
                     longrepr_url = self.make_longrepr_url_for(outcome_set,
                                                               failure)

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	Wed Mar 18 10:27:40 2009
@@ -18,11 +18,13 @@
         log = StringIO("""F a/b.py:test_one
 . a/b.py:test_two
 s a/b.py:test_three
+S a/c.py:test_four
 """)
         
         rev_outcome_set.populate(log)
 
-        assert rev_outcome_set.skipped == set([("a.b","test_three")])
+        assert rev_outcome_set.skipped == set([("a.b","test_three"),
+                                               ("a.c", "test_four")])
         assert rev_outcome_set.failed == set([("a.b", "test_one")])
         assert rev_outcome_set.numpassed == 1
 
@@ -39,6 +41,11 @@
         res = rev_outcome_set.get_outcome(("a.b", "test_two"))
         assert res == '.'
 
+        res = rev_outcome_set.get_outcome(("a.c", "test_four"))
+        assert res == 'S'
+        key_namekey = rev_outcome_set.get_key_namekey(("a.c", "test_four"))
+        assert key_namekey == (('foo', 40), ("a.c", "test_four"))
+
     def test_populate_from_empty(self):
         rev_outcome_set = summary.RevisionOutcomeSet(0)
         log = StringIO("")