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

Jelmer Vernooij jelmer at samba.org
Fri Dec 3 19:13:45 MST 2010


The branch, master has been updated
       via  e4f5b03 Allow /+subunit for builds.
      from  36cdf9c Fix use of plain_logs.

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


- Log -----------------------------------------------------------------
commit e4f5b0390027154a49c63e57593e8450d5981de7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Dec 4 03:14:15 2010 +0100

    Allow /+subunit for builds.

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

Summary of changes:
 buildfarm/web/__init__.py |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 7d65bf4..451f27b 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -41,6 +41,7 @@ from buildfarm import (
 from buildfarm.build import (
     LogFileMissing,
     NoSuchBuildError,
+    NoTestOutput,
     )
 
 import cgi
@@ -955,8 +956,16 @@ class BuildFarmApp(object):
                     build_checksum = wsgiref.util.shift_path_info(environ)
                     build = self.buildfarm.builds.get_by_checksum(build_checksum)
                     page = ViewBuildPage(self.buildfarm)
-                    plain_logs = (get_param(form, "plain") is not None and get_param(form, "plain").lower() in ("yes", "1", "on", "true", "y"))
-                    yield "".join(page.render(myself, build, plain_logs))
+                    subfn = wsgiref.util.shift_path_info(environ)
+                    if subfn == "+plain":
+                        yield "".join(page.render(myself, build, True))
+                    elif subfn == "+subunit":
+                        try:
+                            yield build.read_subunit().read()
+                        except NoTestOutput:
+                            yield "There was no test output"
+                    elif subfn == "":
+                        yield "".join(page.render(myself, build, False))
                 elif fn == "":
                     page = ViewSummaryPage(self.buildfarm)
                     yield "".join(page.render_html(myself))


-- 
build.samba.org


More information about the samba-cvs mailing list