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

[Matthieu Patou]

The branch, master has been updated
       via  0ddfedc Improve status for special cases
       via  b30dfc3 Handle test stage a bit differently due to samba_* particularity
      from  2851694 Use the correct css class for checker

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


- Log -----------------------------------------------------------------
commit 0ddfedcf52b8d28a68a7b85640b85d4070d02936
Author: Matthieu Patou <mat at matws.net>
Date:   Tue Nov 9 20:46:48 2010 +0300

    Improve status for special cases

commit b30dfc3c5eb3259c5f3aef5305e500a3b876a16c
Author: Matthieu Patou <mat at matws.net>
Date:   Tue Nov 9 20:46:10 2010 +0300

    Handle test stage a bit differently due to samba_* particularity

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

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


Changeset truncated at 500 lines:

diff --git a/buildfarm/data.py b/buildfarm/data.py
index 80a633c..a637c3c 100644
--- a/buildfarm/data.py
+++ b/buildfarm/data.py
@@ -70,6 +70,7 @@ def build_status_from_logs(log, err):
     """get status of build"""
     test_failures = 0
     test_successes = 0
+    test_seen = 0
     ret = BuildStatus()
 
     stages = []
@@ -78,7 +79,17 @@ def build_status_from_logs(log, err):
         m = re.match("^([A-Z_]+) STATUS:(\s*\d+)$", l)
         if m:
             stages.append((m.group(1), int(m.group(2).strip())))
+            if m.group(1) == "TEST":
+                test_seen = 1
             continue
+        m = re.match("^ACTION (PASSED|FAILED):\s+test$", l)
+        if m and not test_seen:
+            if m.group(1) == "PASSED":
+                stages.append(("TEST", 0))
+            else:
+                stages.append(("TEST", 1))
+            continue
+
         if l.startswith("No space left on device"):
             ret.other_failures.add("disk full")
             continue
@@ -109,7 +120,7 @@ def build_status_from_logs(log, err):
         if test_successes + test_failures == 0:
             # No granular test output
             return ("TEST", result)
-        if result == 0 and test_failures == 0:
+        if result == 1 and test_failures == 0:
             ret.other_failures.add("inconsistent test result")
             return ("TEST", -1)
         return ("TEST", test_failures)
diff --git a/web/build.py b/web/build.py
index 16347be..5b2a605 100755
--- a/web/build.py
+++ b/web/build.py
@@ -110,9 +110,11 @@ 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:
+    if "inconsistent test result" in status.other_failures:
         ostatus += "/"+span("status failed", "unexpected return code")
     bstatus = "/".join([span_status(n, s) for (n, s) in status.stages])
+    if bstatus == "":
+        bstatus = "?"
     return bstatus + ostatus
 
 


-- 
build.samba.org