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

[Matthieu Patou]

The branch, master has been updated
       via  0367b80 Force the string conversion to avoid write() argument must be string error
       via  7f1938e Display more clearly when make test returns an error with no failed tests
      from  bc21f20 Unbreak the testsuite, rename cache2 back to cache.

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


- Log -----------------------------------------------------------------
commit 0367b808e7effeef4272e89ad7a769581b147ccb
Author: Matthieu Patou <mat at matws.net>
Date:   Tue Nov 9 00:21:21 2010 +0300

    Force the string conversion to avoid write() argument must be string error

commit 7f1938edfd688d8f798042a5817ad9957f007645
Author: Matthieu Patou <mat at matws.net>
Date:   Mon Nov 8 09:57:57 2010 +0300

    Display more clearly when make test returns an error with no failed tests

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

Summary of changes:
 buildfarm/data.py |    3 ++-
 web/build.py      |    8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/data.py b/buildfarm/data.py
index a13b526..d5e936a 100644
--- a/buildfarm/data.py
+++ b/buildfarm/data.py
@@ -49,6 +49,7 @@ def check_dir_exists(kind, path):
 def build_status_from_logs(log, err):
     """get status of build"""
     m = re.search("TEST STATUS:(\s*\d+)", log)
+    other_failures = set()
     if m:
         tstatus = int(m.group(1).strip())
     else:
@@ -62,6 +63,7 @@ def build_status_from_logs(log, err):
                 tstatus = 255
             if m.group(1) == "FAILED" and tstatus == 0:
                 tstatus = -1
+                other_failures.add("make test error")
         else:
             tstatus = None
 
@@ -83,7 +85,6 @@ def build_status_from_logs(log, err):
     else:
         cstatus = None
 
-    other_failures = set()
     m = re.search("(PANIC|INTERNAL ERROR):.*", log)
     if m:
         other_failures.add("panic")
diff --git a/web/build.py b/web/build.py
index 590ab38..8f8a293 100755
--- a/web/build.py
+++ b/web/build.py
@@ -51,7 +51,7 @@ history = history.History(db)
 hostsdb = open_hostdb()
 
 compilers = db.compilers
-hosts = dict([(host.name, host) for host in hostsdb.hosts()])
+hosts = dict([(str(host.name), host) for host in hostsdb.hosts()])
 trees = db.trees
 OLDAGE = db.OLDAGE
 
@@ -106,6 +106,8 @@ def html_build_status(status):
         ostatus += "/"+span("status failed", "disk full")
     if "timeout" in status.other_failures:
         ostatus += "/"+span("status failed", "timeout")
+    if "make test error" in status.other_failures:
+        ostatus += "/"+span("status failed", "unexpected return code")
     bstatus = "/".join([span_status(s) for s in status.stages])
     return bstatus + ostatus
 
@@ -299,7 +301,7 @@ def view_recent_builds(myself, tree, sort_by):
                 age_ctime = build.age_ctime()
                 (revision, revision_time) = build.revision_details()
                 if revision:
-                    all_builds.append([age_ctime, host.platform, "<a href='%s?function=View+Host;host=%s;tree=%s;compiler=%s#%s'>%s</a>" % (myself, host.name, tree, compiler, host.name, host.name), compiler, tree, status, revision_link(myself, revision, tree), revision_time])
+                    all_builds.append([age_ctime, str(host.platform), "<a href='%s?function=View+Host;host=%s;tree=%s;compiler=%s#%s'>%s</a>" % (myself, host.name, tree, compiler, host.name, host.name), compiler, tree, status, revision_link(myself, revision, tree), revision_time])
 
     all_builds.sort(cmp_funcs[sort_by])
 
@@ -754,7 +756,7 @@ def main_menu():
     yield "<div id='build-menu'>"
     yield "<select name='host'>"
     for name, host in hosts.iteritems():
-        yield "<option value='%s'>%s -- %s</option>\n" % (name, host.platform, name)
+        yield "<option value='%s'>%s -- %s</option>\n" % (name, str(host.platform), name)
     yield "</select>"
     yield "<select name='tree'>"
     for tree, t in trees.iteritems():


-- 
build.samba.org