[SCM] build.samba.org - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  cde39b2 add test for Build.has_host.
      from  066ce8d remove htmlization of status handling in data.py.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cde39b22ba5797c5ba41fd6bc3cd64b318d8d6bb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Nov 2 11:13:08 2010 +0100

    add test for Build.has_host.

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/data.py            |   10 ++++++++--
 buildfarm/tests/test_data.py |    5 +++++
 web/build.py                 |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/data.py b/buildfarm/data.py
index a825d0f..0c0383d 100644
--- a/buildfarm/data.py
+++ b/buildfarm/data.py
@@ -335,7 +335,7 @@ class BuildResultStore(object):
         else:
             sstatus = None
 
-        return (cstatus, bstatus, istatus, tstatus, sstatus, other_failures)
+        return ((cstatus, bstatus, istatus, tstatus, sstatus), other_failures)
 
     def lcov_status(self, tree):
         """get status of build"""
@@ -392,7 +392,13 @@ class BuildResultStore(object):
         return ret
 
     def has_host(self, host):
-        return host in os.listdir(os.path.join(self.datadir, "upload"))
+        for name in os.listdir(os.path.join(self.datadir, "upload")):
+            try:
+                if name.split(".")[2] == host:
+                    return True
+            except IndexError:
+                pass
+        return False
 
     def host_age(self, host):
         """get the overall age of a host"""
diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py
index f882ef1..42d06f0 100755
--- a/buildfarm/tests/test_data.py
+++ b/buildfarm/tests/test_data.py
@@ -117,3 +117,8 @@ error2
 error3""")
         build = self.x.get_build("tdb", "charis", "cc")
         self.assertEquals(3, build.err_count())
+
+    def test_has_host(self):
+        self.assertFalse(self.x.has_host("charis"))
+        self.create_mock_logfile("tdb", "charis", "cc")
+        self.assertTrue(self.x.has_host("charis"))
diff --git a/web/build.py b/web/build.py
index 7090654..1aacd7e 100755
--- a/web/build.py
+++ b/web/build.py
@@ -79,7 +79,7 @@ def build_link(myself, tree, host, compiler, rev, status):
 
 
 def html_build_status(status):
-    (cstatus, bstatus, istatus, tstatus, sstatus, other_failures) = status
+    ((cstatus, bstatus, istatus, tstatus, sstatus), other_failures) = status
     def span(classname, contents):
         return "<span class=\"%s\">%s</span>" % (classname, contents)
 


-- 
build.samba.org