Make status easily marshallable and extensible, use the new format

diff --git a/buildfarm/data.py b/buildfarm/data.py
index 0593923ee6ffe5691d86254bbf52522b4b319eca..e2502d226f5f1a73208dbd0bad1951e9e94c324c 100644 (file)
--- a/buildfarm/data.py
+++ b/buildfarm/data.py
@@ -86,7 +86,8 @@ def build_status_from_logs(log, err):
     else:
         sstatus = None
 
-    return ((cstatus, bstatus, istatus, tstatus, sstatus), other_failures)
+    return {"config": cstatus, "build": bstatus, "install": istatus,\
+            "test": tstatus, "checker": sstatus, "other": other_failures}
 
 
 def lcov_extract_percentage(text):
@@ -261,6 +262,34 @@ class CachingBuild(Build):
 
         return ret
 
+    def unmarshall_status(self, cnt):
+        tab = cnt.split('\n')
+        hash = {}
+        for l in tab:
+            tab2 = l.split(':', 1)
+            if tab2[0] == "other":
+                tab3 = []
+                if len(tab2) > 1:
+                    tab3 = tab2[1].split('%')
+                hash[tab2[0]] = tab3
+            else:
+                if tab2[1] == "None":
+                    hash[tab2[0]] = tab2[1]
+                else:
+                    hash[tab2[0]] = None
+
+        return hash
+
+    def marshall_status(self, val):
+        tab = []
+        for k in val.keys():
+            if k != "other":
+                tab.append("%s:%s" % (k, val[k]))
+            else:
+                tab.append("%s:%s" % (k, "%".join(val[k])))
+
+        return "\n".join(tab)
+
     def status(self):
         file = self._store.build_fname(self.tree, self.host, self.compiler, self.rev)
         cachefile = self._store.cache_fname(self.tree, self.host, self.compiler, self.rev)+".status"
@@ -274,12 +303,14 @@ class CachingBuild(Build):
             st2 = None
 
         if st2 and st1.st_ctime <= st2.st_mtime:
-            return util.FileLoad(cachefile)
+             cnt = util.FileLoad(cachefile)
+             return self.unmarshall_status(cnt)
 
         ret = super(CachingBuild, self).status()
 
         if not self._store.readonly:
-            util.FileSave(cachefile, ret)
+            cnt = self.marshall_status(ret)
+            util.FileSave(cachefile, cnt)
 
         return ret
 

diff --git a/web/build.py b/web/build.py
index e31871dee392eee62d13549d860e6a75f133c503..ad524f9d138ffb6f85969b4b935365e17c22c310 100755 (executable)
--- a/web/build.py
+++ b/web/build.py
@@ -79,7 +79,12 @@ def build_link(myself, tree, host, compiler, rev, status):
 
 
 def html_build_status(status):
-    ((cstatus, bstatus, istatus, tstatus, sstatus), other_failures) = status
+    cstatus = status.get("config")
+    bstatus = status.get("build")
+    istatus = status.get("install")
+    tstatus = status.get("test")
+    sstatus = status.get("checker")
+    other_failures = status.get("other")
     def span(classname, contents):
         return "<span class=\"%s\">%s</span>" % (classname, contents)