Author: David Schneider <david.schnei...@picle.org> Branch: buildbot-update Changeset: r843:f6696e09bd51 Date: 2013-08-29 15:16 +0200 http://bitbucket.org/pypy/buildbot/changeset/f6696e09bd51/
Log: allow an empty string as branch name shown in the meta-branch <default>. Group all entries in summary.py by the meta-branch diff --git a/bot2/pypybuildbot/summary.py b/bot2/pypybuildbot/summary.py --- a/bot2/pypybuildbot/summary.py +++ b/bot2/pypybuildbot/summary.py @@ -374,7 +374,7 @@ def _start_cat_branch(self, cat_branch, fine=False): category, branch = cat_branch - branch = default_name(branch) + branch = meta_branch_name(branch) category = category_name(category) self.cur_cat_branch = (category, branch) @@ -623,8 +623,11 @@ return v return subst -default_name = make_subst(['default', None], '<default>') -default_value = make_subst(['default', '<default>'], ['default', None]) +# Map certain branch names from SourceStamps to a common name shown on the page +meta_branch_name = make_subst(['default', '', None], '<default>') +# map the meta-branch <default> to the actual branch entries from the +# SourceStamp +default_value = make_subst('<default>', ['default', '', None]) category_name = make_subst(None, '-') nocat_value = make_subst("-", None) @@ -749,6 +752,7 @@ if not test_rev(got_rev): continue + branch = meta_branch_name(branch) cat_branch = (builderStatus.category, branch) runs, no_revision_builds = cat_branches.setdefault(cat_branch, diff --git a/bot2/pypybuildbot/test/test_summary.py b/bot2/pypybuildbot/test/test_summary.py --- a/bot2/pypybuildbot/test/test_summary.py +++ b/bot2/pypybuildbot/test/test_summary.py @@ -482,6 +482,9 @@ builder.nextBuildNumber = n +METABRANCH = '<default>' + + class TestSummary(object): def setup_method(self, meth): @@ -510,7 +513,7 @@ out = s.body(req) cat_branch = res() - assert cat_branch == {(None, None): ({}, [build])} + assert cat_branch == {(None, METABRANCH): ({}, [build])} def test_one_build_no_logs(self): builder = status_builder.BuilderStatus('builder0', None, self.master, '') @@ -527,7 +530,7 @@ out = s.body(req) cat_branch = res() - revs = cat_branch[(None, None)][0] + revs = cat_branch[(None, METABRANCH)][0] assert revs.keys() == ['50000'] assert 'success' in out @@ -553,7 +556,7 @@ out = s.body(req) cat_branch = res() - revs = cat_branch[(None, None)][0] + revs = cat_branch[(None, METABRANCH)][0] assert revs.keys() == ['50000'] assert 'step borken' in out @@ -569,7 +572,7 @@ out = s.body(req) cat_branch = res() - revs = cat_branch[(None, None)][0] + revs = cat_branch[(None, METABRANCH)][0] assert revs.keys() == ['60000'] outcome = revs['60000']['builder0'] assert outcome.revision == '60000' @@ -588,7 +591,7 @@ out = s.body(req) cat_branch = res() - revs = cat_branch[(None, None)][0] + revs = cat_branch[(None, METABRANCH)][0] assert sorted(revs.keys()) == ['60000', '60001'] outcome = revs['60000']['builder0'] assert outcome.revision == '60000' @@ -619,7 +622,7 @@ out = s.body(req) cat_branch = res() - revs = cat_branch[(None, None)][0] + revs = cat_branch[(None, METABRANCH)][0] assert sorted(revs.keys()) == ['60000'] outcome = revs['60000']['builder0'] assert outcome.revision == '60000' @@ -639,7 +642,7 @@ out = s.body(req) cat_branch = res() - revs = cat_branch[(None, None)][0] + revs = cat_branch[(None, METABRANCH)][0] assert sorted(revs.keys()) == ['60000'] outcome = revs['60000']['builder0'] assert outcome.revision == '60000' @@ -660,7 +663,7 @@ out = s.body(req) cat_branch = res() - runs = cat_branch[(None, None)][0] + runs = cat_branch[(None, METABRANCH)][0] assert sorted(runs.keys()) == [(0, '60000'), (1, '60000'), (2, '60001')] outcome = runs[(0, '60000')]['builder0'] assert outcome.revision == '60000' @@ -697,7 +700,7 @@ out = s.body(req) cat_branch = res() - runs = cat_branch[(None, None)][0] + runs = cat_branch[(None, METABRANCH)][0] assert sorted(runs.keys()) == [(0, '60000'), (2, '60001')] outcome = runs[(0, '60000')]['builder0'] assert outcome.revision == '60000' _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit