The branch, master has been updated via 7645665 Add test for Kai's wrong culprit mail. via 4b037f0 Simplify menu. from d81c9cd Remove more pointless encoding.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 76456654a64f6b058a2d14d93c6474a360661f7f Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Nov 17 11:38:27 2010 +0100 Add test for Kai's wrong culprit mail. commit 4b037f0066cafaca84d7a62ee8438eeb21281f45 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Nov 17 11:36:53 2010 +0100 Simplify menu. ----------------------------------------------------------------------- Summary of changes: buildfarm/tests/test_data.py | 8 +++++++- buildfarm/web/__init__.py | 13 ++----------- 2 files changed, 9 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py index 4ed8a16..cf4d906 100755 --- a/buildfarm/tests/test_data.py +++ b/buildfarm/tests/test_data.py @@ -18,7 +18,6 @@ from cStringIO import StringIO import os import testtools -import time import unittest from buildfarm import data @@ -340,6 +339,13 @@ class BuildStatusRegressedSinceTests(testtools.TestCase): ([("CONFIGURE", 0)], []), ([("CONFIGURE", 0), ("BUILD", 0)], [])) + def test_less_errors(self): + self.assertRegressedSince( + False, + ([("CONFIGURE", 0), ("BUILD", 0), ("TEST", 0), ("INSTALL", 1)], []), + ([("CONFIGURE", 0), ("BUILD", 0), ("TEST", 0), ("INSTALL", 0)], [])) + + class UploadBuildResultStoreTestBase(object): diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 7badf2d..3d091a4 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -698,12 +698,6 @@ class ViewHostPage(BuildFarmPage): yield "<div class='build-section' id='build-summary'>" yield '<h2>Host summary:</h2>' for host in requested_hosts: - # make sure we have some data from it - try: - self.buildfarm.hostdb.host(host) - except hostdb.NoSuchHost: - continue - builds = list(self.buildfarm.get_host_builds(host)) if len(builds) > 0: yield "".join(self._render_build_list_header(host)) @@ -894,18 +888,15 @@ class BuildFarmApp(object): def __init__(self, buildfarm): self.buildfarm = buildfarm - # host.properties are unicode object and the framework expect string object - self.hosts = dict([(host.name, host) for host in self.buildfarm.hostdb.hosts()]) - def main_menu(self): """main page""" yield "<form method='GET'>\n" yield "<div id='build-menu'>\n" yield "<select name='host'>\n" - for name, host in self.hosts.iteritems(): + for host in self.buildfarm.hostdb.hosts(): yield "<option value='%s'>%s -- %s</option>\n" % ( - name, host.platform.encode("utf-8"), name) + host.name, host.platform.encode("utf-8"), host.name) yield "</select>\n" yield "<select name='tree'>\n" for tree, t in self.buildfarm.trees.iteritems(): -- build.samba.org