From warner at users.sourceforge.net  Thu May 22 22:11:27 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:11:27 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web grid.py, NONE,
	1.1 baseweb.py, 1.34, 1.35 build.py, 1.16, 1.17 builder.py,
	1.17, 1.18 classic.css, 1.2, 1.3 index.html, 1.4,
	1.5 waterfall.py, 1.28, 1.29
Message-ID: <E1JzJ0S-0002IB-8P@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16506/buildbot/status/web

Modified Files:
	baseweb.py build.py builder.py classic.css index.html 
	waterfall.py 
Added Files:
	grid.py 
Log Message:
[project @ #72:statusgrid.patch]
Add a "status grid" web display which has a row for each builder and a column
for each distinct sourcestamp.

Original author: dustin at v.igoro.us
Date: 2008-02-17 18:16:14+00:00

Index: baseweb.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/baseweb.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- baseweb.py	23 Mar 2008 03:14:52 -0000	1.34
+++ baseweb.py	22 May 2008 22:11:25 -0000	1.35
@@ -14,6 +14,7 @@
      build_get_class, ICurrentBox, OneLineMixin, map_branches, \
      make_stop_form, make_force_build_form
 from buildbot.status.web.waterfall import WaterfallStatusResource
+from buildbot.status.web.grid import GridStatusResource
 from buildbot.status.web.changes import ChangesResource
 from buildbot.status.web.builder import BuildersResource
 from buildbot.status.web.slaves import BuildSlavesResource
@@ -280,6 +281,9 @@
                   to individual changes, builders, builds, steps, and logs.
                   A number of query-arguments can be added to influence
                   the display.
+     /grid : another summary display that shows a grid of builds, with
+             sourcestamps on the x axis, and builders on the y.  Query 
+             arguments similar to those for the waterfall can be added.
      /builders/BUILDERNAME: a page summarizing the builder. This includes
                             references to the Schedulers that feed it,
                             any builds currently in the queue, which
@@ -431,6 +435,7 @@
     def setupUsualPages(self):
         #self.putChild("", IndexOrWaterfallRedirection())
         self.putChild("waterfall", WaterfallStatusResource())
+        self.putChild("grid", GridStatusResource())
         self.putChild("builders", BuildersResource()) # has builds/steps/logs
         self.putChild("changes", ChangesResource())
         self.putChild("buildslaves", BuildSlavesResource())

Index: build.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/build.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- build.py	21 Nov 2007 09:23:34 -0000	1.16
+++ build.py	22 May 2008 22:11:25 -0000	1.17
@@ -10,6 +10,7 @@
 
 from buildbot.status.web.tests import TestsResource
 from buildbot.status.web.step import StepsResource
+from buildbot import version, util
 
 # /builders/$builder/builds/$buildnum
 class StatusResourceBuild(HtmlResource):
@@ -29,6 +30,7 @@
     def body(self, req):
         b = self.build_status
         status = self.getStatus(req)
+        projectURL = status.getProjectURL()
         projectName = status.getProjectName()
         data = ('<div class="title"><a href="%s">%s</a></div>\n'
                 % (self.path_to_root(req), projectName))
@@ -136,7 +138,6 @@
             data += "</ol>\n"
             #data += html.PRE(b.changesText()) # TODO
 
-
         if b.isFinished() and self.builder_control is not None:
             data += "<h3>Resubmit Build:</h3>\n"
             # can we rebuild it exactly?
@@ -163,6 +164,29 @@
             data += '<input type="submit" value="Rebuild" />\n'
             data += '</form>\n'
 
+        # TODO: this stuff should be generated by a template of some sort
+        data += '<hr /><div class="footer">\n'
+
+        welcomeurl = self.path_to_root(req) + "index.html"
+        data += '[<a href="%s">welcome</a>]\n' % welcomeurl
+        data += "<br />\n"
+
+        data += '<a href="http://buildbot.sourceforge.net/">Buildbot</a>'
+        data += "-%s " % version
+        if projectName:
+            data += "working for the "
+            if projectURL:
+                data += "<a href=\"%s\">%s</a> project." % (projectURL,
+                                                            projectName)
+            else:
+                data += "%s project." % projectName
+        data += "<br />\n"
+        data += ("Page built: " +
+                 time.strftime("%a %d %b %Y %H:%M:%S",
+                               time.localtime(util.now()))
+                 + "\n")
+        data += '</div>\n'
+
         return data
 
     def stop(self, req):
@@ -176,11 +200,8 @@
                   "'%s': %s\n" % (name, comments))
         c.stopBuild(reason)
         # we're at http://localhost:8080/svn-hello/builds/5/stop?[args] and
-        # we want to go to: http://localhost:8080/svn-hello/builds/5 or
-        # http://localhost:8080/waterfall
-        #
-        #return Redirect("../%d" % self.build.getNumber())
-        r = Redirect("../../../../waterfall")
+        # we want to go to: http://localhost:8080/svn-hello
+        return Redirect("../..")
         d = defer.Deferred()
         reactor.callLater(1, d.callback, r)
         return DeferredResource(d)
@@ -209,11 +230,7 @@
         # have to wait for a current build to finish). The next-most
         # preferred place is somewhere that the user can see tangible
         # evidence of their build starting (or to see the reason that it
-        # didn't start). This could either be the Builder page, or the
-        # waterfall.
-        #r = Redirect("../../../..") # this takes us back to the welcome page
-        #r = Redirect("../../../../waterfall") # or the Waterfall
-        #r = Redirect("../../../../waterfall?show=%s" % builder_name)
+        # didn't start). This should be the Builder page.
         r = Redirect("../..") # the Builder's page
         d = defer.Deferred()
         reactor.callLater(1, d.callback, r)

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/builder.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- builder.py	21 Nov 2007 09:24:18 -0000	1.17
+++ builder.py	22 May 2008 22:11:25 -0000	1.18
@@ -10,6 +10,7 @@
      make_force_build_form, OneLineMixin
 from buildbot.process.base import BuildRequest
 from buildbot.sourcestamp import SourceStamp
+from buildbot import version, util
 
 from buildbot.status.web.build import BuildsResource, StatusResourceBuild
 
@@ -124,6 +125,31 @@
             </form>
             """ % pingURL
 
+        # TODO: this stuff should be generated by a template of some sort
+        projectURL = status.getProjectURL()
+        projectName = status.getProjectName()
+        data += '<hr /><div class="footer">\n'
+
+        welcomeurl = self.path_to_root(req) + "index.html"
+        data += '[<a href="%s">welcome</a>]\n' % welcomeurl
+        data += "<br />\n"
+
+        data += '<a href="http://buildbot.sourceforge.net/">Buildbot</a>'
+        data += "-%s " % version
+        if projectName:
+            data += "working for the "
+            if projectURL:
+                data += "<a href=\"%s\">%s</a> project." % (projectURL,
+                                                            projectName)
+            else:
+                data += "%s project." % projectName
+        data += "<br />\n"
+        data += ("Page built: " +
+                 time.strftime("%a %d %b %Y %H:%M:%S",
+                               time.localtime(util.now()))
+                 + "\n")
+        data += '</div>\n'
+
         return data
 
     def force(self, req):
@@ -166,12 +192,14 @@
             # TODO: tell the web user that their request could not be
             # honored
             pass
-        return Redirect("../../waterfall")
+        # send the user back to the builder page
+        return Redirect(".")
 
     def ping(self, req):
         log.msg("web ping of builder '%s'" % self.builder_status.getName())
         self.builder_control.ping() # TODO: there ought to be an ISlaveControl
-        return Redirect("../../waterfall")
+        # send the user back to the builder page
+        return Redirect(".")
 
     def getChild(self, path, req):
         if path == "force":
@@ -229,7 +257,8 @@
                 builder_control = c.getBuilder(bname)
             build = StatusResourceBuilder(builder_status, builder_control)
             build.force(req)
-        return Redirect("../../waterfall")
+        # back to the welcome page
+        return Redirect("../..")
 
     def stop(self, req):
         for bname in self.status.getBuilderNames():
@@ -252,7 +281,8 @@
                 build = StatusResourceBuild(build_status, build_control,
                                             builder_control)
                 build.stop(req)
-        return Redirect("../../waterfall")
+        # go back to the welcome page
+        return Redirect("../..")
 
 
 # /builders
@@ -275,6 +305,56 @@
                       urllib.quote(bname, safe='')))
         data += "</ol>\n"
 
+        # TODO: this stuff should be generated by a template of some sort
+        projectURL = s.getProjectURL()
+        projectName = s.getProjectName()
+        data += '<hr /><div class="footer">\n'
+
+        welcomeurl = self.path_to_root(req) + "index.html"
+        data += '[<a href="%s">welcome</a>]\n' % welcomeurl
+        data += "<br />\n"
+
+        data += '<a href="http://buildbot.sourceforge.net/">Buildbot</a>'
+        data += "-%s " % version
+        if projectName:
+            data += "working for the "
+            if projectURL:
+                data += "<a href=\"%s\">%s</a> project." % (projectURL,
+                                                            projectName)
+            else:
+                data += "%s project." % projectName
+        data += "<br />\n"
+        data += ("Page built: " +
+                 time.strftime("%a %d %b %Y %H:%M:%S",
+                               time.localtime(util.now()))
+                 + "\n")
+        data += '</div>\n'
+
+        # TODO: this stuff should be generated by a template of some sort
+        projectURL = s.getProjectURL()
+        projectName = s.getProjectName()
+        data += '<hr /><div class="footer">\n'
+
+        welcomeurl = self.path_to_root(req) + "index.html"
+        data += '[<a href="%s">welcome</a>]\n' % welcomeurl
+        data += "<br />\n"
+
+        data += '<a href="http://buildbot.sourceforge.net/">Buildbot</a>'
+        data += "-%s " % version
+        if projectName:
+            data += "working for the "
+            if projectURL:
+                data += "<a href=\"%s\">%s</a> project." % (projectURL,
+                                                            projectName)
+            else:
+                data += "%s project." % projectName
+        data += "<br />\n"
+        data += ("Page built: " +
+                 time.strftime("%a %d %b %Y %H:%M:%S",
+                               time.localtime(util.now()))
+                 + "\n")
+        data += '</div>\n'
+
         return data
 
     def getChild(self, path, req):

Index: classic.css
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/classic.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- classic.css	30 Sep 2007 09:23:57 -0000	1.2
+++ classic.css	22 May 2008 22:11:25 -0000	1.3
@@ -41,3 +41,38 @@
 .start,.running {
 	background-color: yellow;
 }
+
+/* grid styles */
+
+table.Grid {
+    border-collapse: collapse;
+}
+
+table.Grid tr td {
+    padding: 0.2em;
+    margin: 0px;
+    text-align: center;
+}
+
+table.Grid tr td.title {
+    font-size: 90%;
+    border-right: 1px gray solid;
+    border-bottom: 1px gray solid;
+}
+
+table.Grid tr td.sourcestamp {
+    font-size: 90%;
+}
+
+table.Grid tr td.builder {
+    text-align: right;
+    font-size: 90%;
+}
+
+table.Grid tr td.build {
+    border: 1px gray solid;
+}
+
+div.footer {
+    font-size: 80%;
+}

--- NEW FILE: grid.py ---
from __future__ import generators

import sys, string, types, time, os.path
import urllib

from buildbot import interfaces, util
from buildbot import version
from buildbot.status.web.base import HtmlResource

# set grid_css to the full pathname of the css file
if hasattr(sys, "frozen"):
    # all 'data' files are in the directory of our executable
    here = os.path.dirname(sys.executable)
    grid_css = os.path.abspath(os.path.join(here, "grid.css"))
else:
    # running from source; look for a sibling to __file__
    up = os.path.dirname
    grid_css = os.path.abspath(os.path.join(up(__file__), "grid.css"))

class ANYBRANCH: pass # a flag value, used below

class GridStatusResource(HtmlResource):
    # TODO: docs
    status = None
    control = None
    changemaster = None

    def __init__(self, allowForce=True, css=None):
        HtmlResource.__init__(self)

        self.allowForce = allowForce
        self.css = css or grid_css

    def getTitle(self, request):
        status = self.getStatus(request)
        p = status.getProjectName()
        if p:
            return "BuildBot: %s" % p
        else:
            return "BuildBot"

    def getChangemaster(self, request):
        # TODO: this wants to go away, access it through IStatus
        return request.site.buildbot_service.parent.change_svc

    # handle reloads through an http header
    # TODO: send this as a real header, rather than a tag
    def get_reload_time(self, request):
        if "reload" in request.args:
            try:
                reload_time = int(request.args["reload"][0])
                return max(reload_time, 15)
            except ValueError:
                pass
        return None

    def head(self, request):
        head = ''
        reload_time = self.get_reload_time(request)
        if reload_time is not None:
            head += '<meta http-equiv="refresh" content="%d">\n' % reload_time
        return head

#    def setBuildmaster(self, buildmaster):
#        self.status = buildmaster.getStatus()
#        if self.allowForce:
#            self.control = interfaces.IControl(buildmaster)
#        else:
#            self.control = None
#        self.changemaster = buildmaster.change_svc
#
#        # try to set the page title
#        p = self.status.getProjectName()
#        if p:
#            self.title = "BuildBot: %s" % p
#
    def build_td(self, request, build):
        if not build:
            return '<td class="build">&nbsp;</td>\n'

        if build.isFinished():
            color = build.getColor()
            if color == 'green': color = '#72ff75' # the "Buildbot Green"

            # get the text and annotate the first line with a link
            text = build.getText()
            if not text: text = [ "(no information)" ]
            if text == [ "build", "successful" ]: text = [ "OK" ]
        else:
            color = 'yellow' # to match the yellow of the builder
            text = [ 'building' ]

        name = build.getBuilder().getName()
        number = build.getNumber()
        url = "builders/%s/builds/%d" % (name, number)
        text[0] = '<a href="%s">%s</a>' % (url, text[0])
        text = '<br />\n'.join(text)

        return '<td class="build" bgcolor="%s">%s</td>\n' % (color, text)

    def builder_td(self, request, builder):
        state, builds = builder.getState()

        # look for upcoming builds. We say the state is "waiting" if the
        # builder is otherwise idle and there is a scheduler which tells us a
        # build will be performed some time in the near future. TODO: this
        # functionality used to be in BuilderStatus.. maybe this code should
        # be merged back into it.
        upcoming = []
        builderName = builder.getName()
        for s in self.getStatus(request).getSchedulers():
            if builderName in s.listBuilderNames():
                upcoming.extend(s.getPendingBuildTimes())
        if state == "idle" and upcoming:
            state = "waiting"

        if state == "building":
            color = "yellow"
        elif state == "offline":
            color = "red"
        elif state == "idle":
            color = "white"
        elif state == "waiting":
            color = "yellow"
        else:
            color = "white"

        # TODO: for now, this pending/upcoming stuff is in the "current
        # activity" box, but really it should go into a "next activity" row
        # instead. The only times it should show up in "current activity" is
        # when the builder is otherwise idle.

        # are any builds pending? (waiting for a slave to be free)
        url = 'builders/%s/' % urllib.quote(builder.getName(), safe='')
        text = '<a href="%s">%s</a>' % (url, builder.getName())
        pbs = builder.getPendingBuilds()
        if state != 'idle' or pbs:
            if pbs:
                text += "<br />(%s with %d pending)" % (state, len(pbs))
            else:
                text += "<br />(%s)" % state

        return  '<td valign="center" bgcolor="%s" class="builder">%s</td>\n' % \
            (color, text)

    def stamp_td(self, stamp):
        text = stamp.getText()
        return '<td valign="bottom" class="sourcestamp">%s</td>\n' % \
            "<br />".join(text)

    def body(self, request):
        "This method builds the main waterfall display."

        # get url parameters
        numBuilds = int(request.args.get("width", [5])[0])
        categories = request.args.get("category", [])
        branch = request.args.get("branch", [ANYBRANCH])[0]
        if branch == 'trunk': branch = None

        # and the data we want to render
        status = self.getStatus(request)
        stamps = self.getRecentSourcestamps(status, numBuilds, categories, branch)

        projectURL = status.getProjectURL()
        projectName = status.getProjectName()

        data = '<table class="Grid" border="0" cellspacing="0">\n'
        data += '<tr>\n'
        data += '<td class="title"><a href="%s">%s</a>' % (projectURL, projectName)
        if categories:
            if len(categories) > 1:
                data += '\n<br /><b>Categories:</b><br/>%s' % ('<br/>'.join(categories))
            else:
                data += '\n<br /><b>Category:</b> %s' % categories[0]
        if branch != ANYBRANCH:
            data += '\n<br /><b>Branch:</b> %s' % (branch or 'trunk')
        data += '</td>\n'
        for stamp in stamps:
            data += self.stamp_td(stamp)
        data += '</tr>\n'

        for bn in status.getBuilderNames():
            builds = [None] * len(stamps)

            builder = status.getBuilder(bn)
            if categories and builder.category not in categories:
                continue

            build = builder.getBuild(-1)
            while build and None in builds:
                ss = build.getSourceStamp(specific=True)
                for i in range(len(stamps)):
                    if ss == stamps[i] and builds[i] is None:
                        builds[i] = build
                build = build.getPreviousBuild()

            data += '<tr>\n'
            data += self.builder_td(request, builder)
            for build in builds:
                data += self.build_td(request, build)
            data += '</tr>\n'

        data += '</table>\n'

        # TODO: this stuff should be generated by a template of some sort
        data += '<hr /><div class="footer">\n'

        welcomeurl = self.path_to_root(request) + "index.html"
        data += '[<a href="%s">welcome</a>]\n' % welcomeurl
        data += "<br />\n"

        data += '<a href="http://buildbot.sourceforge.net/">Buildbot</a>'
        data += "-%s " % version
        if projectName:
            data += "working for the "
            if projectURL:
                data += "<a href=\"%s\">%s</a> project." % (projectURL,
                                                            projectName)
            else:
                data += "%s project." % projectName
        data += "<br />\n"
        data += ("Page built: " +
                 time.strftime("%a %d %b %Y %H:%M:%S",
                               time.localtime(util.now()))
                 + "\n")
        data += '</div>\n'
        return data

    def getRecentSourcestamps(self, status, numBuilds, categories, branch):
        """
        get a list of the most recent NUMBUILDS SourceStamp tuples, sorted
        by the earliest start we've seen for them
        """
        # TODO: use baseweb's getLastNBuilds?
        sourcestamps = { } # { ss-tuple : earliest time }
        for bn in status.getBuilderNames():
            builder = status.getBuilder(bn)
            if categories and builder.category not in categories:
                continue
            build = builder.getBuild(-1)
            while build:
                ss = build.getSourceStamp(specific=True)
                start = build.getTimes()[0]
                build = build.getPreviousBuild()

                # skip un-started builds
                if not start: continue

                # skip non-matching branches
                if branch != ANYBRANCH and ss.branch != branch: continue

                sourcestamps[ss] = min(sourcestamps.get(ss, sys.maxint), start)

        # now sort those and take the NUMBUILDS most recent
        sourcestamps = sourcestamps.items()
        sourcestamps.sort(lambda x, y: cmp(x[1], y[1]))
        sourcestamps = map(lambda tup : tup[0], sourcestamps)
        sourcestamps = sourcestamps[-numBuilds:]

        return sourcestamps


Index: index.html
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/index.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.html	26 Sep 2007 06:32:24 -0000	1.4
+++ index.html	22 May 2008 22:11:25 -0000	1.5
@@ -12,6 +12,9 @@
   <li>the <a href="waterfall">Waterfall Display</a> will give you a
   time-oriented summary of recent buildbot activity.</li>
 
+  <li>the <a href="grid">Grid Display</a> will give you a
+  developer-oriented summary of recent buildbot activity.</li>
+
   <li>The <a href="one_box_per_builder">Latest Build</a> for each builder is
   here.</li>
 

Index: waterfall.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/waterfall.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- waterfall.py	30 Mar 2008 02:27:53 -0000	1.28
+++ waterfall.py	22 May 2008 22:11:25 -0000	1.29
@@ -528,7 +528,7 @@
 
         data += "</table>\n"
 
-        data += "<hr />\n"
+        data += '<hr /><div class="footer"\n'
 
         def with_args(req, remove_args=[], new_args=[], new_path=None):
             # sigh, nevow makes this sort of manipulation easier
@@ -591,6 +591,7 @@
                  time.strftime("%a %d %b %Y %H:%M:%S",
                                time.localtime(util.now()))
                  + "\n")
+        data += '</div>\n'
         return data
 
     def body0(self, request, builders):




From warner at users.sourceforge.net  Thu May 22 22:11:31 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:11:31 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web grid.py,1.1,1.2
Message-ID: <E1JzJ0W-0004Xg-24@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16522/buildbot/status/web

Modified Files:
	grid.py 
Log Message:
[project @ #72:grid-absolute.patch]
Use "absolute" instead of "specific" sourcestamps; thanks to Ivan
Chelyubeev <ivan.chelubeev at gmail.com> for providing the patch.

Original author: dustin at v.igoro.us
Date: 2008-03-12 18:17:30+00:00

Index: grid.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/grid.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- grid.py	22 May 2008 22:11:25 -0000	1.1
+++ grid.py	22 May 2008 22:11:29 -0000	1.2
@@ -188,7 +188,7 @@
 
             build = builder.getBuild(-1)
             while build and None in builds:
-                ss = build.getSourceStamp(specific=True)
+                ss = build.getSourceStamp(absolute=True)
                 for i in range(len(stamps)):
                     if ss == stamps[i] and builds[i] is None:
                         builds[i] = build
@@ -239,7 +239,7 @@
                 continue
             build = builder.getBuild(-1)
             while build:
-                ss = build.getSourceStamp(specific=True)
+                ss = build.getSourceStamp(absolute=True)
                 start = build.getTimes()[0]
                 build = build.getPreviousBuild()
 




From warner at users.sourceforge.net  Thu May 22 22:11:38 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:11:38 +0000
Subject: [Buildbot-commits] buildbot/buildbot buildset.py, 1.5,
	1.6 scheduler.py, 1.28, 1.29
Message-ID: <E1JzJ0d-0002N1-0i@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16534/buildbot

Modified Files:
	buildset.py scheduler.py 
Log Message:
[project @ #227:scheduler-property-in-build.patch]
Patch by Dossy Shiobara <dossy at panoptic.com>: It is useful to know
the name of the scheduler that initiated a build request, i.e., to
conditionally FileUpload the results of a Nightly scheduled build.
This patch passes the Scheduler along the BuildRequest chain so
that Build can setProperty("scheduler", self.scheduler.name) in
Build.setupStatus().

Original author: dustin at v.igoro.us
Date: 2008-04-04 02:54:25+00:00

Index: buildset.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/buildset.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- buildset.py	6 Sep 2006 00:41:54 -0000	1.5
+++ buildset.py	22 May 2008 22:11:36 -0000	1.6
@@ -10,7 +10,7 @@
     source.revision), or a build of a certain set of Changes
     (source.changes=list)."""
 
-    def __init__(self, builderNames, source, reason=None, bsid=None):
+    def __init__(self, builderNames, source, reason=None, bsid=None, scheduler=None):
         """
         @param source: a L{buildbot.sourcestamp.SourceStamp}
         """
@@ -20,6 +20,7 @@
         self.stillHopeful = True
         self.status = bss = builder.BuildSetStatus(source, reason,
                                                    builderNames, bsid)
+	self.scheduler = scheduler
 
     def waitUntilSuccess(self):
         return self.status.waitUntilSuccess()
@@ -34,7 +35,7 @@
 
         # create the requests
         for b in builders:
-            req = base.BuildRequest(self.reason, self.source, b.name)
+            req = base.BuildRequest(self.reason, self.source, b.name, self.scheduler)
             reqs.append((b, req))
             self.requests.append(req)
             d = req.waitUntilFinished()

Index: scheduler.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scheduler.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- scheduler.py	21 Mar 2008 01:32:00 -0000	1.28
+++ scheduler.py	22 May 2008 22:11:36 -0000	1.29
@@ -170,7 +170,8 @@
 
         # create a BuildSet, submit it to the BuildMaster
         bs = buildset.BuildSet(self.builderNames,
-                               SourceStamp(changes=changes))
+                               SourceStamp(changes=changes),
+                               scheduler=self)
         self.submit(bs)
 
     def stopService(self):
@@ -304,7 +305,7 @@
         return d
 
     def upstreamBuilt(self, ss):
-        bs = buildset.BuildSet(self.builderNames, ss)
+        bs = buildset.BuildSet(self.builderNames, ss, scheduler=self)
         self.submit(bs)
 
 
@@ -343,7 +344,7 @@
     def doPeriodicBuild(self):
         bs = buildset.BuildSet(self.builderNames,
                                SourceStamp(branch=self.branch),
-                               self.reason)
+                               self.reason, scheduler=self)
         self.submit(bs)
 
 
@@ -501,7 +502,7 @@
         # And trigger a build
         bs = buildset.BuildSet(self.builderNames,
                                SourceStamp(branch=self.branch),
-                               self.reason)
+                               self.reason, scheduler=self)
         self.submit(bs)
 
     def addChange(self, change):
@@ -623,7 +624,7 @@
                 return
 
         reason = "'try' job"
-        bs = buildset.BuildSet(builderNames, ss, reason=reason, bsid=bsid)
+        bs = buildset.BuildSet(builderNames, ss, reason=reason, bsid=bsid, scheduler=self)
         self.parent.submitBuildSet(bs)
 
 class Try_Userpass(TryBase):
@@ -675,7 +676,7 @@
                 return
         ss = SourceStamp(branch, revision, patch)
         reason = "'try' job from user %s" % self.username
-        bs = buildset.BuildSet(builderNames, ss, reason=reason)
+        bs = buildset.BuildSet(builderNames, ss, reason=reason, scheduler=self)
         self.parent.submitBuildSet(bs)
 
         # return a remotely-usable BuildSetStatus object
@@ -702,7 +703,7 @@
         """Trigger this scheduler. Returns a deferred that will fire when the
         buildset is finished.
         """
-        bs = buildset.BuildSet(self.builderNames, ss)
+        bs = buildset.BuildSet(self.builderNames, ss, scheduler=self)
         d = bs.waitUntilFinished()
         self.submit(bs)
         return d




From warner at users.sourceforge.net  Thu May 22 22:11:38 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:11:38 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process base.py,1.76,1.77
Message-ID: <E1JzJ0d-0004am-3R@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16534/buildbot/process

Modified Files:
	base.py 
Log Message:
[project @ #227:scheduler-property-in-build.patch]
Patch by Dossy Shiobara <dossy at panoptic.com>: It is useful to know
the name of the scheduler that initiated a build request, i.e., to
conditionally FileUpload the results of a Nightly scheduled build.
This patch passes the Scheduler along the BuildRequest chain so
that Build can setProperty("scheduler", self.scheduler.name) in
Build.setupStatus().

Original author: dustin at v.igoro.us
Date: 2008-04-04 02:54:25+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- base.py	1 Dec 2007 01:48:58 -0000	1.76
+++ base.py	22 May 2008 22:11:36 -0000	1.77
@@ -52,12 +52,14 @@
 
     implements(interfaces.IBuildRequestControl)
 
-    def __init__(self, reason, source, builderName=None):
+    def __init__(self, reason, source, builderName=None, scheduler=None):
         # TODO: remove the =None on builderName, it is there so I don't have
         # to change a lot of tests that create BuildRequest objects
         assert interfaces.ISourceStamp(source, None)
         self.reason = reason
         self.source = source
+        self.scheduler = scheduler
+
         self.start_watchers = []
         self.finish_watchers = []
         self.status = BuildRequestStatus(source, builderName)
@@ -168,6 +170,7 @@
         # build a source stamp
         self.source = requests[0].mergeWith(requests[1:])
         self.reason = requests[0].mergeReasons(requests[1:])
+        self.scheduler = requests[0].scheduler
 
         #self.abandoned = False
 
@@ -261,6 +264,10 @@
         self.setProperty("buildnumber", self.build_status.number)
         self.setProperty("branch", self.source.branch)
         self.setProperty("revision", self.source.revision)
+        if self.scheduler is None:
+            self.setProperty("scheduler", "none")
+        else:
+            self.setProperty("scheduler", self.scheduler.name)
 
     def setupSlaveBuilder(self, slavebuilder):
         self.slavebuilder = slavebuilder




From warner at users.sourceforge.net  Thu May 22 22:11:38 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:11:38 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_properties.py, 1.12,
	1.13
Message-ID: <E1JzJ0d-0004av-6w@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16534/buildbot/test

Modified Files:
	test_properties.py 
Log Message:
[project @ #227:scheduler-property-in-build.patch]
Patch by Dossy Shiobara <dossy at panoptic.com>: It is useful to know
the name of the scheduler that initiated a build request, i.e., to
conditionally FileUpload the results of a Nightly scheduled build.
This patch passes the Scheduler along the BuildRequest chain so
that Build can setProperty("scheduler", self.scheduler.name) in
Build.setupStatus().

Original author: dustin at v.igoro.us
Date: 2008-04-04 02:54:25+00:00

Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- test_properties.py	18 Mar 2008 20:06:12 -0000	1.12
+++ test_properties.py	22 May 2008 22:11:36 -0000	1.13
@@ -23,6 +23,8 @@
     slave = FakeSlave()
     def getSlaveCommandVersion(self, command, oldversion=None):
         return "1.10"
+class FakeScheduler:
+    name = "fakescheduler"
 
 class Interpolate(unittest.TestCase):
     def setUp(self):
@@ -52,6 +54,7 @@
         cmd = c._interpolateProperties(c.command)
         self.failUnlessEqual(cmd,
                              ["tar", "czf", "build-47.tar.gz", "source"])
+        self.failUnlessEqual(self.build.getProperty("scheduler"), "none")
 
     def testWorkdir(self):
         self.build.setProperty("revision", 47)
@@ -117,6 +120,25 @@
         self.failUnlessEqual(cmd,
                              ["touch", "build-5", "builder-fakebuilder"])
 
+class SchedulerTest(unittest.TestCase):
+    def setUp(self):
+        self.builder = FakeBuilder()
+        self.builder_status = builder.BuilderStatus("fakebuilder")
+        self.builder_status.basedir = "test_properties"
+        self.builder_status.nextBuildNumber = 5
+        rmdirRecursive(self.builder_status.basedir)
+        os.mkdir(self.builder_status.basedir)
+        self.build_status = self.builder_status.newBuild()
+        req = base.BuildRequest("reason", SourceStamp(branch="branch2",
+                                revision=1234), scheduler=FakeScheduler())
+        self.build = base.Build([req])
+        self.build.setBuilder(self.builder)
+        self.build.setupStatus(self.build_status)
+        self.build.setupSlaveBuilder(FakeSlaveBuilder())
+
+    def testWithScheduler(self):
+        self.failUnlessEqual(self.build.getProperty("scheduler"),
+                             "fakescheduler")
 
 run_config = """
 from buildbot.process import factory




From warner at users.sourceforge.net  Thu May 22 22:11:43 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:11:43 +0000
Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.141,1.142
Message-ID: <E1JzJ0h-0004da-TR@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16558/docs

Modified Files:
	buildbot.texinfo 
Log Message:
[project @ #227:scheduler-property-docs.patch]
Documentation for #227:scheduler-property-in-build.patch.

Original author: dustin at v.igoro.us
Date: 2008-04-04 02:57:13+00:00

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- buildbot.texinfo	29 Apr 2008 15:32:14 -0000	1.141
+++ buildbot.texinfo	22 May 2008 22:11:41 -0000	1.142
@@ -4561,6 +4561,21 @@
 requested the ``latest revision'': @code{got_revision} will tell you
 what was actually built).
 
+ at itemize
+ at item buildername
+Name of this builder
+ at item buildnumber
+Number of this build (numbers are unique within the builder)
+ at item branch
+Branch of the source being built, from the SourceStamp
+ at item revision
+Revision of the source being built, from the SourceStamp, as a string
+ at item scheduler
+The name of the scheduler that invoked this build
+ at item slavename
+The name of the buildslave performing this build
+ at end itemize
+
 In custom BuildSteps, you can get and set the build properties with
 the @code{getProperty}/@code{setProperty} methods. Each takes a string
 for the name of the property, and returns or accepts an




From warner at users.sourceforge.net  Thu May 22 22:11:47 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:11:47 +0000
Subject: [Buildbot-commits] buildbot/buildbot/slave commands.py,1.96,1.97
Message-ID: <E1JzJ0m-0004fI-JS@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/slave
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16570/buildbot/slave

Modified Files:
	commands.py 
Log Message:
[project @ #140:getSvnVersionCommand.patch]
Patch from Aaron Maxwell <amax at snaplogic.org>: introduce a method
SVN.getSvnVersionCommand() that returns the shell command used to
determine the svn version.  Useful for subclassing.

Original author: dustin at v.igoro.us
Date: 2008-04-04 03:19:46+00:00

Index: commands.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/commands.py,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- commands.py	29 Apr 2008 20:21:36 -0000	1.96
+++ commands.py	22 May 2008 22:11:45 -0000	1.97
@@ -1559,15 +1559,24 @@
         self.command = c
         return c.start()
 
-    def parseGotRevision(self):
+    def getSvnVersionCommand(self):
+        """
+        Get the (shell) command used to determine SVN revision number
+        of checked-out code
+
+        return: list of strings, passable as the command argument to ShellCommand
+        """
         # svn checkout operations finish with 'Checked out revision 16657.'
         # svn update operations finish the line 'At revision 16654.'
         # But we don't use those. Instead, run 'svnversion'.
         svnversion_command = getCommand("svnversion")
         # older versions of 'svnversion' (1.1.4) require the WC_PATH
         # argument, newer ones (1.3.1) do not.
-        command = [svnversion_command, "."]
-        c = ShellCommand(self.builder, command,
+        return [svnversion_command, "."]
+
+    def parseGotRevision(self):
+        c = ShellCommand(self.builder,
+                         self.getSvnVersionCommand(),
                          os.path.join(self.builder.basedir, self.srcdir),
                          environ=self.env,
                          sendStdout=False, sendStderr=False, sendRC=False,
@@ -1575,16 +1584,16 @@
         c.usePTY = False
         d = c.start()
         def _parse(res):
-            r = c.stdout.strip()
-            # Support for removing svnversion indicator for 'modified'
-            if r[-1] == 'M':
-                r = r[:-1]
+            r_raw = c.stdout.strip()
+            # Extract revision from the version "number" string
+            r = r_raw.rstrip('MS')
+            r = r.split(':')[-1]
             got_version = None
             try:
                 got_version = int(r)
             except ValueError:
                 msg =("SVN.parseGotRevision unable to parse output "
-                      "of svnversion: '%s'" % r)
+                      "of svnversion: '%s'" % r_raw)
                 log.msg(msg)
                 self.sendStatus({'header': msg + "\n"})
             return got_version




From warner at users.sourceforge.net  Thu May 22 22:11:59 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:11:59 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web base.py,1.23,1.24
Message-ID: <E1JzJ10-0002Zo-KZ@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16591/buildbot/status/web

Modified Files:
	base.py 
Log Message:
[project @ #145:OneLineMixin.make_line.patch]
Patch from Aaron Maxwell <amax at snaplogic.org>.  Refactor
OneLineMixin.make_line(), splitting in into two methods: one that
gathers all the data needed for a build (get_line_values), and one
that takes that data, and renders it into an HTML line (make_line).

Original author: dustin at v.igoro.us
Date: 2008-04-04 03:25:51+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/base.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- base.py	23 Mar 2008 03:14:52 -0000	1.23
+++ base.py	22 May 2008 22:11:56 -0000	1.24
@@ -335,7 +335,10 @@
 class OneLineMixin:
     LINE_TIME_FORMAT = "%b %d %H:%M"
 
-    def make_line(self, req, build, include_builder=True):
+    def get_line_values(self, req, build):
+        '''
+        Collect the data needed for each line display
+        '''
         builder_name = build.getBuilder().getName()
         results = build.getResults()
         text = build.getText()
@@ -363,7 +366,13 @@
                   'time': time.strftime(self.LINE_TIME_FORMAT,
                                         time.localtime(build.getTimes()[0])),
                   }
+        return values
 
+    def make_line(self, req, build, include_builder=True):
+        '''
+        Format and render a single line into HTML
+        '''
+        values = self.get_line_values(req, build)
         fmt_pieces = ['<font size="-1">(%(time)s)</font>',
                       'rev=[%(rev)s]',
                       '<span class="%(class)s">%(results)s</span>',




From warner at users.sourceforge.net  Thu May 22 22:12:07 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:07 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status builder.py, 1.106, 1.107
Message-ID: <E1JzJ16-0002fQ-Ks@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16868/buildbot/status

Modified Files:
	builder.py 
Log Message:
[project @ #87:customprops.patch]
Patch by Paul Gain, Roch Gadson <rochester.gadsdon at bakbone.com>, and
Aaron Maxwell <amax at snaplogic.org> to implement "custom properties":
build properties that can be specified when the build is initially
created, e.g., by a scheduler.

Original author: dustin at v.igoro.us
Date: 2008-04-04 03:52:33+00:00

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- builder.py	18 Mar 2008 22:25:55 -0000	1.106
+++ builder.py	22 May 2008 22:12:05 -0000	1.107
@@ -1789,6 +1789,8 @@
         return self.botmaster.parent.projectURL
     def getBuildbotURL(self):
         return self.botmaster.parent.buildbotURL
+    def getCustomBuildProperties(self):
+     return self.botmaster.parent.customBuildProperties
 
     def getURLForThing(self, thing):
         prefix = self.getBuildbotURL()




From warner at users.sourceforge.net  Thu May 22 22:12:07 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:07 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web builder.py, 1.18,
	1.19
Message-ID: <E1JzJ16-0004sS-Lx@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16868/buildbot/status/web

Modified Files:
	builder.py 
Log Message:
[project @ #87:customprops.patch]
Patch by Paul Gain, Roch Gadson <rochester.gadsdon at bakbone.com>, and
Aaron Maxwell <amax at snaplogic.org> to implement "custom properties":
build properties that can be specified when the build is initially
created, e.g., by a scheduler.

Original author: dustin at v.igoro.us
Date: 2008-04-04 03:52:33+00:00

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/builder.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- builder.py	22 May 2008 22:11:25 -0000	1.18
+++ builder.py	22 May 2008 22:12:05 -0000	1.19
@@ -152,7 +152,18 @@
 
         return data
 
-    def force(self, req):
+    def force(self, req, custom_props={}):
+        """
+
+        Custom properties can be passed from the web form.  To do
+        this, subclass this class, overriding the force() method.  You
+        can then determine the properties (usually from form values,
+        by inspecting req.args), then pass them to this superclass
+        force method.
+        
+        @param custom_props: Custom properties to set on build
+        
+        """
         name = req.args.get("username", ["<unknown>"])[0]
         reason = req.args.get("comments", ["<no reason specified>"])[0]
         branch = req.args.get("branch", [""])[0]
@@ -185,7 +196,7 @@
         # button, use their name instead of None, so they'll be informed of
         # the results.
         s = SourceStamp(branch=branch, revision=revision)
-        req = BuildRequest(r, s, self.builder_status.getName())
+        req = BuildRequest(r, s, custom_props, self.builder_status.getName())
         try:
             self.builder_control.requestBuildSoon(req)
         except interfaces.NoSlaveError:




From warner at users.sourceforge.net  Thu May 22 22:12:07 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:07 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps shell.py, 1.19,
	1.20 trigger.py, 1.3, 1.4
Message-ID: <E1JzJ16-0002fS-LM@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16868/buildbot/steps

Modified Files:
	shell.py trigger.py 
Log Message:
[project @ #87:customprops.patch]
Patch by Paul Gain, Roch Gadson <rochester.gadsdon at bakbone.com>, and
Aaron Maxwell <amax at snaplogic.org> to implement "custom properties":
build properties that can be specified when the build is initially
created, e.g., by a scheduler.

Original author: dustin at v.igoro.us
Date: 2008-04-04 03:52:33+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- shell.py	21 Mar 2008 04:25:31 -0000	1.19
+++ shell.py	22 May 2008 22:12:05 -0000	1.20
@@ -334,3 +334,66 @@
     description = ["testing"]
     descriptionDone = ["test"]
     command = ["make", "test"]
+
+class BKBSelectiveTest(Test):
+ 
+    name = "Test"
+    description = ["testing"]
+    descriptionDone = ["test"]
+    warnOnFailure = 1
+
+    # Overridden method simple to include test filtering information in the
+    # command that we run and to support supressing code coverage information
+    # to aid testing speed
+    def start(self):
+        extraenv = {}
+
+        #
+        # See if the NV_TEST_FILTER property has been set. If it has, we want
+        # to pass it in the enviroment to the build slave and adjust the
+        # description of this step to indicate which tests we are running
+        #
+        try:
+            extraenv['NV_TEST_FILTER'] = self.getProperty('NV_TEST_FILTER')
+            description = ["testing (" + self.getProperty('NV_TEST_FILTER') + ")"]
+            descriptionDone = ["test (" + self.getProperty('NV_TEST_FILTER') + ")"]
+        except:
+            # todo - how do we do nothing here?
+            self.command = self.command
+
+        # Now see if we've been asked to suppress code coverage processing.
+        # If we have, this again needs to get passed in the environment to the
+        # slave.
+        try:
+            if "TRUE" == self.getProperty('NV_SUPPRESS_COVERAGE_PROCESSING'):
+                extraenv['NV_SUPPRESS_COVERAGE_PROCESSING'] = "TRUE"
+        except:
+            # todo - how do we do nothing here?
+            self.command = self.command
+
+        # Combine any enviroment we want to set with any that was already
+        # specified
+        if self.remote_kwargs.has_key('env') != True:
+            self.remote_kwargs['env'] = {}
+
+        self.remote_kwargs['env'].update(extraenv)
+
+        # Invoke the base class to actually carry out the shell command
+        ShellCommand.start(self)
+
+    def describe(self, done=False):
+        filter = None
+        try:
+            filter = self.getProperty('NV_TEST_FILTER')
+        except:
+            filter = None
+
+        if done is True:
+            word = "test"
+        else:
+            word = "testing"
+
+        if None != filter:
+            return [ word + " (" + filter + ")" ]
+        else:
+            return [ word ]

Index: trigger.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/trigger.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- trigger.py	21 Mar 2008 01:32:00 -0000	1.3
+++ trigger.py	22 May 2008 22:12:05 -0000	1.4
@@ -51,6 +51,7 @@
             self.step_status.setText(["interrupted"])
 
     def start(self):
+        custom_props = {}
         self.running = True
         ss = self.build.getSourceStamp()
         if self.updateSourceStamp:
@@ -61,6 +62,7 @@
                 pass
             if got:
                 ss = ss.getAbsoluteSourceStamp(got)
+        custom_props = self.build.getCustomProperties()
         # (is there an easier way to find the BuildMaster?)
         all_schedulers = self.build.builder.botmaster.parent.allSchedulers()
         all_schedulers = dict([(sch.name, sch) for sch in all_schedulers])
@@ -75,7 +77,7 @@
             if all_schedulers.has_key(scheduler):
                 sch = all_schedulers[scheduler]
                 if isinstance(sch, Triggerable):
-                    dl.append(sch.trigger(ss))
+                    dl.append(sch.trigger(ss, custom_props))
                     triggered_schedulers.append(scheduler)
                 else:
                     unknown_schedulers.append(scheduler)




From warner at users.sourceforge.net  Thu May 22 22:12:07 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:07 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process base.py,1.77,1.78
Message-ID: <E1JzJ16-0004sA-6N@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16868/buildbot/process

Modified Files:
	base.py 
Log Message:
[project @ #87:customprops.patch]
Patch by Paul Gain, Roch Gadson <rochester.gadsdon at bakbone.com>, and
Aaron Maxwell <amax at snaplogic.org> to implement "custom properties":
build properties that can be specified when the build is initially
created, e.g., by a scheduler.

Original author: dustin at v.igoro.us
Date: 2008-04-04 03:52:33+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- base.py	22 May 2008 22:11:36 -0000	1.77
+++ base.py	22 May 2008 22:12:05 -0000	1.78
@@ -39,6 +39,9 @@
                   provide this, but for forced builds the user requesting the
                   build will provide a string.
 
+    @type custom_props: dictionary.
+    @ivar custom_props: custom user properties.
+
     @ivar status: the IBuildStatus object which tracks our status
 
     @ivar submittedAt: a timestamp (seconds since epoch) when this request
@@ -49,10 +52,11 @@
     source = None
     builder = None
     startCount = 0 # how many times we have tried to start this build
+    custom_props = {}
 
     implements(interfaces.IBuildRequestControl)
 
-    def __init__(self, reason, source, builderName=None, scheduler=None):
+    def __init__(self, reason, source, builderName=None, scheduler=None, custom_props=None):
         # TODO: remove the =None on builderName, it is there so I don't have
         # to change a lot of tests that create BuildRequest objects
         assert interfaces.ISourceStamp(source, None)
@@ -60,6 +64,9 @@
         self.source = source
         self.scheduler = scheduler
 
+        if not custom_props: custom_props = {}
+        self.custom_props = custom_props
+
         self.start_watchers = []
         self.finish_watchers = []
         self.status = BuildRequestStatus(source, builderName)
@@ -86,6 +93,9 @@
         self.finish_watchers.append(d)
         return d
 
+    def customProps(self):
+     return self.custom_props
+
     # these are called by the Builder
 
     def requestSubmitted(self, builder):
@@ -172,6 +182,9 @@
         self.reason = requests[0].mergeReasons(requests[1:])
         self.scheduler = requests[0].scheduler
 
+        # Set custom properties.
+        self.custom_properties = requests[0].customProps()
+
         #self.abandoned = False
 
         self.progress = None
@@ -198,10 +211,12 @@
         properties can live."""
         self.build_status.setProperty(propname, value)
 
+    def getCustomProperties(self):
+        return self.custom_properties
+
     def getProperty(self, propname):
         return self.build_status.properties[propname]
 
-
     def allChanges(self):
         return self.source.changes
 
@@ -268,6 +283,8 @@
             self.setProperty("scheduler", "none")
         else:
             self.setProperty("scheduler", self.scheduler.name)
+        for key, userProp in self.custom_properties.items():
+            self.setProperty(key, userProp)
 
     def setupSlaveBuilder(self, slavebuilder):
         self.slavebuilder = slavebuilder




From warner at users.sourceforge.net  Thu May 22 22:12:07 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:07 +0000
Subject: [Buildbot-commits] buildbot/buildbot buildset.py, 1.6, 1.7 master.py,
	1.111, 1.112 scheduler.py, 1.29, 1.30
Message-ID: <E1JzJ15-0002f0-U2@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16868/buildbot

Modified Files:
	buildset.py master.py scheduler.py 
Log Message:
[project @ #87:customprops.patch]
Patch by Paul Gain, Roch Gadson <rochester.gadsdon at bakbone.com>, and
Aaron Maxwell <amax at snaplogic.org> to implement "custom properties":
build properties that can be specified when the build is initially
created, e.g., by a scheduler.

Original author: dustin at v.igoro.us
Date: 2008-04-04 03:52:33+00:00

Index: buildset.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/buildset.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- buildset.py	22 May 2008 22:11:36 -0000	1.6
+++ buildset.py	22 May 2008 22:12:05 -0000	1.7
@@ -10,13 +10,18 @@
     source.revision), or a build of a certain set of Changes
     (source.changes=list)."""
 
-    def __init__(self, builderNames, source, reason=None, bsid=None, scheduler=None):
+    def __init__(self, builderNames, source, reason=None, bsid=None,
+                 scheduler=None, custom_props=None):
         """
         @param source: a L{buildbot.sourcestamp.SourceStamp}
         """
         self.builderNames = builderNames
         self.source = source
         self.reason = reason
+
+        if not custom_props: custom_props = {}
+        self.custom_props = custom_props
+
         self.stillHopeful = True
         self.status = bss = builder.BuildSetStatus(source, reason,
                                                    builderNames, bsid)
@@ -35,7 +40,8 @@
 
         # create the requests
         for b in builders:
-            req = base.BuildRequest(self.reason, self.source, b.name, self.scheduler)
+            req = base.BuildRequest(self.reason, self.source, b.name, 
+                                    self.scheduler, self.custom_props)
             reqs.append((b, req))
             self.requests.append(req)
             d = req.waitUntilFinished()

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- master.py	21 Nov 2007 09:25:48 -0000	1.111
+++ master.py	22 May 2008 22:12:05 -0000	1.112
@@ -339,6 +339,7 @@
     projectURL = None
     buildbotURL = None
     change_svc = None
+    customBuildProperties = None
 
     def __init__(self, basedir, configFileName="master.cfg"):
         service.MultiService.__init__(self)
@@ -494,6 +495,7 @@
                       "schedulers", "builders",
                       "slavePortnum", "debugPassword", "manhole",
                       "status", "projectName", "projectURL", "buildbotURL",
+                      "customBuildProperties"
                       )
         for k in config.keys():
             if k not in known_keys:
@@ -521,6 +523,7 @@
             projectName = config.get('projectName')
             projectURL = config.get('projectURL')
             buildbotURL = config.get('buildbotURL')
+            customBuildProperties = config.get('customBuildProperties')
 
         except KeyError, e:
             log.msg("config dictionary is missing a required parameter")
@@ -666,6 +669,7 @@
         self.projectName = projectName
         self.projectURL = projectURL
         self.buildbotURL = buildbotURL
+        self.customBuildProperties = customBuildProperties
 
         # self.slaves: Disconnect any that were attached and removed from the
         # list. Update self.checker with the new list of passwords, including

Index: scheduler.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scheduler.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- scheduler.py	22 May 2008 22:11:36 -0000	1.29
+++ scheduler.py	22 May 2008 22:12:05 -0000	1.30
@@ -665,7 +665,8 @@
         self.parent = parent
         self.username = username
 
-    def perspective_try(self, branch, revision, patch, builderNames):
+    def perspective_try(self, branch, revision, patch, builderNames,
+                        custom_props):
         log.msg("user %s requesting build on builders %s" % (self.username,
                                                              builderNames))
         for b in builderNames:
@@ -676,7 +677,13 @@
                 return
         ss = SourceStamp(branch, revision, patch)
         reason = "'try' job from user %s" % self.username
-        bs = buildset.BuildSet(builderNames, ss, reason=reason, scheduler=self)
+
+        bs = buildset.BuildSet(builderNames, 
+                               ss,
+                               reason=reason, 
+                               scheduler=self,
+                               custom_props=custom_props)
+
         self.parent.submitBuildSet(bs)
 
         # return a remotely-usable BuildSetStatus object
@@ -699,11 +706,11 @@
     def getPendingBuildTimes(self):
         return []
 
-    def trigger(self, ss):
+    def trigger(self, ss, custom_props={}):
         """Trigger this scheduler. Returns a deferred that will fire when the
         buildset is finished.
         """
-        bs = buildset.BuildSet(self.builderNames, ss, scheduler=self)
+        bs = buildset.BuildSet(self.builderNames, ss, scheduler=self, custom_props=custom_props)
         d = bs.waitUntilFinished()
         self.submit(bs)
         return d




From warner at users.sourceforge.net  Thu May 22 22:12:07 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:07 +0000
Subject: [Buildbot-commits] buildbot/buildbot/scripts runner.py, 1.60,
	1.61 tryclient.py, 1.20, 1.21
Message-ID: <E1JzJ16-0004sN-KH@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/scripts
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16868/buildbot/scripts

Modified Files:
	runner.py tryclient.py 
Log Message:
[project @ #87:customprops.patch]
Patch by Paul Gain, Roch Gadson <rochester.gadsdon at bakbone.com>, and
Aaron Maxwell <amax at snaplogic.org> to implement "custom properties":
build properties that can be specified when the build is initially
created, e.g., by a scheduler.

Original author: dustin at v.igoro.us
Date: 2008-04-04 03:52:33+00:00

Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- runner.py	28 Mar 2008 05:55:46 -0000	1.60
+++ runner.py	22 May 2008 22:12:05 -0000	1.61
@@ -763,6 +763,8 @@
 
         ["builder", "b", None,
          "Run the trial build on this Builder. Can be used multiple times."],
+        ["customproperties", None, None,
+         "A set of custom properties made available in the build environment, format:prop=value,propb=valueb..."],
         ]
 
     optFlags = [
@@ -772,10 +774,22 @@
     def __init__(self):
         super(TryOptions, self).__init__()
         self['builders'] = []
+        self['custom_props'] = {}
 
     def opt_builder(self, option):
         self['builders'].append(option)
 
+    def opt_customproperties(self, option):
+        # We need to split the value of this option into a dictionary of custom
+        # properties
+        custom_props = {}
+        propertylist = option.split(",")
+        for i in range(0,len(propertylist)):
+            print propertylist[i]
+            splitproperty = propertylist[i].split("=")
+            custom_props[splitproperty[0]] = splitproperty[1]
+        self['custom_props'] = custom_props
+
     def opt_patchlevel(self, option):
         self['patchlevel'] = int(option)
 

Index: tryclient.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/tryclient.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- tryclient.py	22 Nov 2007 01:04:34 -0000	1.20
+++ tryclient.py	22 May 2008 22:12:05 -0000	1.21
@@ -442,9 +442,13 @@
 
     def _deliverJob_pb(self, remote):
         ss = self.sourcestamp
+
         d = remote.callRemote("try",
-                              ss.branch, ss.revision, ss.patch,
-                              self.builderNames)
+                              ss.branch,
+                              ss.revision,
+                              ss.patch,
+                              self.builderNames,
+                              self.config.get('custom_props', {}))
         d.addCallback(self._deliverJob_pb2)
         return d
     def _deliverJob_pb2(self, status):




From warner at users.sourceforge.net  Thu May 22 22:12:12 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:12 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process base.py,1.78,1.79
Message-ID: <E1JzJ1A-0004ua-RS@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17017/buildbot/process

Modified Files:
	base.py 
Log Message:
[project @ #87:customprops-fix-debugclient.patch]
Patch by gward to teach DebugPerspective? and debugclient about custom
build properties

Original author: dustin at v.igoro.us
Date: 2008-04-04 04:09:12+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- base.py	22 May 2008 22:12:05 -0000	1.78
+++ base.py	22 May 2008 22:12:10 -0000	1.79
@@ -66,6 +66,8 @@
 
         if not custom_props: custom_props = {}
         self.custom_props = custom_props
+        assert isinstance(self.custom_props, dict), \
+               "custom_props must be a dict (not %r)" % (self.custom_props,)
 
         self.start_watchers = []
         self.finish_watchers = []




From warner at users.sourceforge.net  Thu May 22 22:12:12 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:12 +0000
Subject: [Buildbot-commits] buildbot/buildbot master.py,1.112,1.113
Message-ID: <E1JzJ1A-0004ub-Rr@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17017/buildbot

Modified Files:
	master.py 
Log Message:
[project @ #87:customprops-fix-debugclient.patch]
Patch by gward to teach DebugPerspective? and debugclient about custom
build properties

Original author: dustin at v.igoro.us
Date: 2008-04-04 04:09:12+00:00

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- master.py	22 May 2008 22:12:05 -0000	1.112
+++ master.py	22 May 2008 22:12:10 -0000	1.113
@@ -227,11 +227,19 @@
     def detached(self, mind):
         pass
 
-    def perspective_requestBuild(self, buildername, reason, branch, revision):
+    def perspective_requestBuild(self, buildername, reason, branch, revision, custom_props):
+        assert isinstance(custom_props, dict), \
+               "custom_props must be a dict (not %r)" % (custom_props,)
+
+        # Provide default values for any custom build properties the
+        # client did not send.
+        for propertyDict in (self.master.customBuildProperties or []):
+            custom_props.setdefault(propertyDict['propertyName'], "")
+
         c = interfaces.IControl(self.master)
         bc = c.getBuilder(buildername)
         ss = SourceStamp(branch, revision)
-        br = BuildRequest(reason, ss, buildername)
+        br = BuildRequest(reason, ss, builderName=buildername, custom_props=custom_props)
         bc.requestBuild(br)
 
     def perspective_pingBuilder(self, buildername):




From warner at users.sourceforge.net  Thu May 22 22:12:12 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:12 +0000
Subject: [Buildbot-commits] buildbot/buildbot/clients debug.py,1.8,1.9
Message-ID: <E1JzJ1A-0004uZ-RO@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/clients
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17017/buildbot/clients

Modified Files:
	debug.py 
Log Message:
[project @ #87:customprops-fix-debugclient.patch]
Patch by gward to teach DebugPerspective? and debugclient about custom
build properties

Original author: dustin at v.igoro.us
Date: 2008-04-04 04:09:12+00:00

Index: debug.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/clients/debug.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debug.py	7 Feb 2007 04:25:29 -0000	1.8
+++ debug.py	22 May 2008 22:12:10 -0000	1.9
@@ -105,8 +105,9 @@
             if revision == '':
                 revision = None
         reason = "debugclient 'Request Build' button pushed"
+        custom_props = {}
         d = self.remote.callRemote("requestBuild",
-                                   name, reason, branch, revision)
+                                   name, reason, branch, revision, custom_props)
         d.addErrback(self.err)
 
     def do_ping(self, widget):




From warner at users.sourceforge.net  Thu May 22 22:12:16 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:16 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web builder.py, 1.19,
	1.20
Message-ID: <E1JzJ1F-0002iv-Ke@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17042/buildbot/status/web

Modified Files:
	builder.py 
Log Message:
[project @ #87:param-tweaks.patch]
Tweaks to use keyword arguments to make sure that builderName,
scheduler, and custom_props are passed appropriately.

Original author: dustin at v.igoro.us
Date: 2008-04-04 04:11:09+00:00

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/builder.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- builder.py	22 May 2008 22:12:05 -0000	1.19
+++ builder.py	22 May 2008 22:12:14 -0000	1.20
@@ -196,7 +196,7 @@
         # button, use their name instead of None, so they'll be informed of
         # the results.
         s = SourceStamp(branch=branch, revision=revision)
-        req = BuildRequest(r, s, custom_props, self.builder_status.getName())
+        req = BuildRequest(r, s, builderName=self.builder_status.getName(), custom_props=custom_props)
         try:
             self.builder_control.requestBuildSoon(req)
         except interfaces.NoSlaveError:




From warner at users.sourceforge.net  Thu May 22 22:12:16 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:16 +0000
Subject: [Buildbot-commits] buildbot/buildbot buildset.py,1.7,1.8
Message-ID: <E1JzJ1F-0002it-Kc@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17042/buildbot

Modified Files:
	buildset.py 
Log Message:
[project @ #87:param-tweaks.patch]
Tweaks to use keyword arguments to make sure that builderName,
scheduler, and custom_props are passed appropriately.

Original author: dustin at v.igoro.us
Date: 2008-04-04 04:11:09+00:00

Index: buildset.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/buildset.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- buildset.py	22 May 2008 22:12:05 -0000	1.7
+++ buildset.py	22 May 2008 22:12:14 -0000	1.8
@@ -41,7 +41,8 @@
         # create the requests
         for b in builders:
             req = base.BuildRequest(self.reason, self.source, b.name, 
-                                    self.scheduler, self.custom_props)
+                                    scheduler=self.scheduler,
+                                    custom_props=self.custom_props)
             reqs.append((b, req))
             self.requests.append(req)
             d = req.waitUntilFinished()




From warner at users.sourceforge.net  Thu May 22 22:12:20 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:20 +0000
Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.142,1.143
Message-ID: <E1JzJ1J-0002kj-1R@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17063/docs

Modified Files:
	buildbot.texinfo 
Log Message:
[project @ wrap-long-doc-line.patch]
Wrap an overly long line in the documentation.

Original author: dustin at v.igoro.us
Date: 2008-04-14 16:03:44+00:00

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- buildbot.texinfo	22 May 2008 22:11:41 -0000	1.142
+++ buildbot.texinfo	22 May 2008 22:12:18 -0000	1.143
@@ -5302,9 +5302,19 @@
 [GCC 4.1.2 20060928 (prerelease) (Debian 4.1.1-15)] on linux2
 Type "help", "copyright", "credits" or "license" for more information.
 >>> import sys
->>> print sys.path
-['', '/usr/lib/python24.zip', '/usr/lib/python2.4', '/usr/lib/python2.4/plat-linux2', '/usr/lib/python2.4/lib-tk', '/usr/lib/python2.4/lib-dynload', '/usr/local/lib/python2.4/site-packages', '/usr/lib/python2.4/site-packages', '/usr/lib/python2.4/site-packages/Numeric', '/var/lib/python-support/python2.4', '/usr/lib/site-python']
->>> 
+>>> import pprint
+>>> pprint.pprint(sys.path)
+['',
+ '/usr/lib/python24.zip',
+ '/usr/lib/python2.4',
+ '/usr/lib/python2.4/plat-linux2',
+ '/usr/lib/python2.4/lib-tk',
+ '/usr/lib/python2.4/lib-dynload',
+ '/usr/local/lib/python2.4/site-packages',
+ '/usr/lib/python2.4/site-packages',
+ '/usr/lib/python2.4/site-packages/Numeric',
+ '/var/lib/python-support/python2.4',
+ '/usr/lib/site-python']
 @end example
 
 In this case, putting the code into




From warner at users.sourceforge.net  Thu May 22 22:12:24 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:24 +0000
Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.143,1.144
Message-ID: <E1JzJ1Q-0002nT-To@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17075/docs

Modified Files:
	buildbot.texinfo 
Log Message:
[project @ wrap-long-doc-line-2.patch]
Wrap another long line

Original author: dustin at v.igoro.us
Date: 2008-04-14 16:06:01+00:00

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- buildbot.texinfo	22 May 2008 22:12:18 -0000	1.143
+++ buildbot.texinfo	22 May 2008 22:12:22 -0000	1.144
@@ -2049,7 +2049,8 @@
 
 @example
 % buildbot checkconfig master.cfg
-/usr/lib/python2.4/site-packages/buildbot/master.py:559: DeprecationWarning: c['sources'] is deprecated as of 0.7.6 and will be removed by 0.8.0 . Please use c['change_source'] instead.
+/usr/lib/python2.4/site-packages/buildbot/master.py:559: DeprecationWarning: c['sources'] is
+deprecated as of 0.7.6 and will be removed by 0.8.0 . Please use c['change_source'] instead.
   warnings.warn(m, DeprecationWarning)
 Config file is good!
 @end example




From warner at users.sourceforge.net  Thu May 22 22:12:32 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:32 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web baseweb.py, 1.35,
	1.36
Message-ID: <E1JzJ1U-0002pQ-O1@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17087/buildbot/status/web

Modified Files:
	baseweb.py 
Log Message:
[project @ #246:stopLyingAboutForceBuild.diff]
Patch by Ben Hearsum <bhearsum at wittydomain.com>: don't appear to be
able to control builds when you can't

Original author: dustin at v.igoro.us
Date: 2008-04-20 21:38:35+00:00

Index: baseweb.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/baseweb.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- baseweb.py	22 May 2008 22:11:25 -0000	1.35
+++ baseweb.py	22 May 2008 22:12:30 -0000	1.36
@@ -91,6 +91,7 @@
 
     def body(self, req):
         status = self.getStatus(req)
+        control = self.getControl(req)
         numbuilds = int(req.args.get("numbuilds", [self.numbuilds])[0])
         builders = req.args.get("builder", [])
         branches = [b for b in req.args.get("branch", []) if b]
@@ -122,12 +123,13 @@
             data += " <li>No matching builds found</li>\n"
         data += "</ul>\n"
 
-        if building:
-            stopURL = "builders/_all/stop"
-            data += make_stop_form(stopURL, True, "Builds")
-        if online:
-            forceURL = "builders/_all/force"
-            data += make_force_build_form(forceURL, True)
+        if control is not None:
+            if building:
+                stopURL = "builders/_all/stop"
+                data += make_stop_form(stopURL, True, "Builds")
+            if online:
+                forceURL = "builders/_all/force"
+                data += make_force_build_form(forceURL, True)
 
         return data
 
@@ -170,7 +172,7 @@
 # /one_box_per_builder
 #  accepts builder=, branch=
 class OneBoxPerBuilder(HtmlResource):
-    """This shows a narrow table with one row per build. The leftmost column
+    """This shows a narrow table with one row per builder. The leftmost column
     contains the builder name. The next column contains the results of the
     most recent build. The right-hand column shows the builder's current
     activity.
@@ -183,6 +185,7 @@
 
     def body(self, req):
         status = self.getStatus(req)
+        control = self.getControl(req)
 
         builders = req.args.get("builder", status.getBuilderNames())
         branches = [b for b in req.args.get("branch", []) if b]
@@ -231,12 +234,13 @@
 
         data += "</table>\n"
 
-        if building:
-            stopURL = "builders/_all/stop"
-            data += make_stop_form(stopURL, True, "Builds")
-        if online:
-            forceURL = "builders/_all/force"
-            data += make_force_build_form(forceURL, True)
+        if control is not None:
+            if building:
+                stopURL = "builders/_all/stop"
+                data += make_stop_form(stopURL, True, "Builds")
+            if online:
+                forceURL = "builders/_all/force"
+                data += make_force_build_form(forceURL, True)
 
         return data
 




From warner at users.sourceforge.net  Thu May 22 22:12:36 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:36 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process base.py,1.79,1.80
Message-ID: <E1JzJ1Y-0002s6-Jj@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17098/buildbot/process

Modified Files:
	base.py 
Log Message:
[project @ #107:delayBuildStart.diff]
Patch by Ben Hearsum <bhearsum at wittydomain.com>: delay status
notification about build start until _startBuild_2 (after a lock has
been acquired)

Original author: dustin at v.igoro.us
Date: 2008-04-21 19:22:02+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- base.py	22 May 2008 22:12:10 -0000	1.79
+++ base.py	22 May 2008 22:12:34 -0000	1.80
@@ -341,7 +341,6 @@
             d.callback(self)
             return d
 
-        self.build_status.buildStarted(self)
         self.acquireLocks().addCallback(self._startBuild_2)
         return d
 
@@ -361,6 +360,7 @@
         return defer.succeed(None)
 
     def _startBuild_2(self, res):
+        self.build_status.buildStarted(self)
         self.startNextStep()
 
     def setupBuild(self, expectations):




From warner at users.sourceforge.net  Thu May 22 22:12:40 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:40 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web xmlrpc.py,1.4,1.5
Message-ID: <E1JzJ1c-0002u3-HX@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17109/buildbot/status/web

Modified Files:
	xmlrpc.py 
Log Message:
[project @ #195:getStatus-to-getLastBuildResults.patch]
Change xmlrpc_getStatus to xmlrpc_getLastBuildResults as Brian suggested

Original author: dustin at v.igoro.us
Date: 2008-04-28 23:06:33+00:00

Index: xmlrpc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/xmlrpc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xmlrpc.py	20 Mar 2008 18:04:57 -0000	1.4
+++ xmlrpc.py	22 May 2008 22:12:38 -0000	1.5
@@ -22,7 +22,7 @@
         log.msg("getAllBuilders")
         return self.status.getBuilderNames()
 
-    def xmlrpc_getStatus(self, builder_name):
+    def xmlrpc_getLastBuildResults(self, builder_name):
         """Return the result of the last build for the given builder
         """
         builder = self.status.getBuilder(builder_name)




From warner at users.sourceforge.net  Thu May 22 22:12:44 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:44 +0000
Subject: [Buildbot-commits] buildbot/buildbot/changes dnotify.py,1.4,1.5
Message-ID: <E1JzJ1g-0002w4-GH@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/changes
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17121/buildbot/changes

Modified Files:
	dnotify.py 
Log Message:
[project @ #282:remove-shebang.patch]
Patch by Gianluca Sforna <giallu at gmail.com> to remove unnecessary shebangs
about which rpmlint complains.

Original author: dustin at v.igoro.us
Date: 2008-05-20 03:23:41+00:00

Index: dnotify.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/dnotify.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dnotify.py	6 Sep 2006 00:41:54 -0000	1.4
+++ dnotify.py	22 May 2008 22:12:42 -0000	1.5
@@ -1,4 +1,3 @@
-#! /usr/bin/python
 
 import fcntl, signal, os
 




From warner at users.sourceforge.net  Thu May 22 22:12:44 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:44 +0000
Subject: [Buildbot-commits] buildbot/buildbot/clients base.py, 1.13,
	1.14 debug.py, 1.9, 1.10 gtkPanes.py, 1.13, 1.14
Message-ID: <E1JzJ1g-0002wB-LZ@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/clients
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17121/buildbot/clients

Modified Files:
	base.py debug.py gtkPanes.py 
Log Message:
[project @ #282:remove-shebang.patch]
Patch by Gianluca Sforna <giallu at gmail.com> to remove unnecessary shebangs
about which rpmlint complains.

Original author: dustin at v.igoro.us
Date: 2008-05-20 03:23:41+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/clients/base.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- base.py	24 Nov 2006 19:27:11 -0000	1.13
+++ base.py	22 May 2008 22:12:42 -0000	1.14
@@ -1,4 +1,3 @@
-#! /usr/bin/python
 
 import sys, re
 

Index: debug.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/clients/debug.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- debug.py	22 May 2008 22:12:10 -0000	1.9
+++ debug.py	22 May 2008 22:12:42 -0000	1.10
@@ -1,4 +1,3 @@
-#! /usr/bin/python
 
 from twisted.internet import gtk2reactor
 gtk2reactor.install()

Index: gtkPanes.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/clients/gtkPanes.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gtkPanes.py	12 Dec 2006 03:33:42 -0000	1.13
+++ gtkPanes.py	22 May 2008 22:12:42 -0000	1.14
@@ -1,4 +1,3 @@
-#! /usr/bin/python
 
 from twisted.internet import gtk2reactor
 gtk2reactor.install()




From warner at users.sourceforge.net  Thu May 22 22:12:44 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:44 +0000
Subject: [Buildbot-commits] buildbot/buildbot dnotify.py,1.2,1.3
Message-ID: <E1JzJ1g-00058I-OS@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17121/buildbot

Modified Files:
	dnotify.py 
Log Message:
[project @ #282:remove-shebang.patch]
Patch by Gianluca Sforna <giallu at gmail.com> to remove unnecessary shebangs
about which rpmlint complains.

Original author: dustin at v.igoro.us
Date: 2008-05-20 03:23:41+00:00

Index: dnotify.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/dnotify.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dnotify.py	6 Sep 2006 00:41:54 -0000	1.2
+++ dnotify.py	22 May 2008 22:12:42 -0000	1.3
@@ -1,4 +1,3 @@
-#! /usr/bin/python
 
 # spiv wants this
 




From warner at users.sourceforge.net  Thu May 22 22:12:44 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:44 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test emit.py, 1.2,
	1.3 emitlogs.py, 1.3, 1.4 sleep.py, 1.1, 1.2
Message-ID: <E1JzJ1g-0002wg-Tr@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17121/buildbot/test

Modified Files:
	emit.py emitlogs.py sleep.py 
Log Message:
[project @ #282:remove-shebang.patch]
Patch by Gianluca Sforna <giallu at gmail.com> to remove unnecessary shebangs
about which rpmlint complains.

Original author: dustin at v.igoro.us
Date: 2008-05-20 03:23:41+00:00

Index: emit.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/emit.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- emit.py	20 Jun 2006 08:08:51 -0000	1.2
+++ emit.py	22 May 2008 22:12:42 -0000	1.3
@@ -1,4 +1,3 @@
-#! /usr/bin/python
 
 import os, sys
 

Index: emitlogs.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/emitlogs.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- emitlogs.py	6 Aug 2006 22:37:20 -0000	1.3
+++ emitlogs.py	22 May 2008 22:12:42 -0000	1.4
@@ -1,5 +1,3 @@
-#! /usr/bin/python
-
 import sys, time, os.path, StringIO
 
 mode = 0

Index: sleep.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/sleep.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sleep.py	19 Jul 2005 01:55:20 -0000	1.1
+++ sleep.py	22 May 2008 22:12:42 -0000	1.2
@@ -1,4 +1,3 @@
-#! /usr/bin/python
 
 import sys, time
 delay = int(sys.argv[1])




From warner at users.sourceforge.net  Thu May 22 22:12:48 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:48 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps shell.py,1.20,1.21
Message-ID: <E1JzJ1n-0005A9-1g@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17158/buildbot/steps

Modified Files:
	shell.py 
Log Message:
[project @ remove-bkbselectivetest.patch]

Original author: dustin at v.igoro.us
Date: 2008-05-17 18:29:11+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- shell.py	22 May 2008 22:12:05 -0000	1.20
+++ shell.py	22 May 2008 22:12:46 -0000	1.21
@@ -335,65 +335,3 @@
     descriptionDone = ["test"]
     command = ["make", "test"]
 
-class BKBSelectiveTest(Test):
- 
-    name = "Test"
-    description = ["testing"]
-    descriptionDone = ["test"]
-    warnOnFailure = 1
-
-    # Overridden method simple to include test filtering information in the
-    # command that we run and to support supressing code coverage information
-    # to aid testing speed
-    def start(self):
-        extraenv = {}
-
-        #
-        # See if the NV_TEST_FILTER property has been set. If it has, we want
-        # to pass it in the enviroment to the build slave and adjust the
-        # description of this step to indicate which tests we are running
-        #
-        try:
-            extraenv['NV_TEST_FILTER'] = self.getProperty('NV_TEST_FILTER')
-            description = ["testing (" + self.getProperty('NV_TEST_FILTER') + ")"]
-            descriptionDone = ["test (" + self.getProperty('NV_TEST_FILTER') + ")"]
-        except:
-            # todo - how do we do nothing here?
-            self.command = self.command
-
-        # Now see if we've been asked to suppress code coverage processing.
-        # If we have, this again needs to get passed in the environment to the
-        # slave.
-        try:
-            if "TRUE" == self.getProperty('NV_SUPPRESS_COVERAGE_PROCESSING'):
-                extraenv['NV_SUPPRESS_COVERAGE_PROCESSING'] = "TRUE"
-        except:
-            # todo - how do we do nothing here?
-            self.command = self.command
-
-        # Combine any enviroment we want to set with any that was already
-        # specified
-        if self.remote_kwargs.has_key('env') != True:
-            self.remote_kwargs['env'] = {}
-
-        self.remote_kwargs['env'].update(extraenv)
-
-        # Invoke the base class to actually carry out the shell command
-        ShellCommand.start(self)
-
-    def describe(self, done=False):
-        filter = None
-        try:
-            filter = self.getProperty('NV_TEST_FILTER')
-        except:
-            filter = None
-
-        if done is True:
-            word = "test"
-        else:
-            word = "testing"
-
-        if None != filter:
-            return [ word + " (" + filter + ")" ]
-        else:
-            return [ word ]




From warner at users.sourceforge.net  Thu May 22 22:12:54 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:54 +0000
Subject: [Buildbot-commits] buildbot/buildbot master.py,1.113,1.114
Message-ID: <E1JzJ1q-0005Bk-VX@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17173/buildbot

Modified Files:
	master.py 
Log Message:
[project @ #124:remove-customBuildProperties-unused.patch]
Remove unused and undocumented customBuildProperties config.
This did not allow users to specify global properties; rather, it
specified descriptions for properties that were not used anywhere in
the codebase.

Original author: dustin at v.igoro.us
Date: 2008-04-12 05:50:01+00:00

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- master.py	22 May 2008 22:12:10 -0000	1.113
+++ master.py	22 May 2008 22:12:52 -0000	1.114
@@ -233,8 +233,6 @@
 
         # Provide default values for any custom build properties the
         # client did not send.
-        for propertyDict in (self.master.customBuildProperties or []):
-            custom_props.setdefault(propertyDict['propertyName'], "")
 
         c = interfaces.IControl(self.master)
         bc = c.getBuilder(buildername)
@@ -347,7 +345,6 @@
     projectURL = None
     buildbotURL = None
     change_svc = None
-    customBuildProperties = None
 
     def __init__(self, basedir, configFileName="master.cfg"):
         service.MultiService.__init__(self)
@@ -503,7 +500,6 @@
                       "schedulers", "builders",
                       "slavePortnum", "debugPassword", "manhole",
                       "status", "projectName", "projectURL", "buildbotURL",
-                      "customBuildProperties"
                       )
         for k in config.keys():
             if k not in known_keys:
@@ -531,7 +527,6 @@
             projectName = config.get('projectName')
             projectURL = config.get('projectURL')
             buildbotURL = config.get('buildbotURL')
-            customBuildProperties = config.get('customBuildProperties')
 
         except KeyError, e:
             log.msg("config dictionary is missing a required parameter")
@@ -677,7 +672,6 @@
         self.projectName = projectName
         self.projectURL = projectURL
         self.buildbotURL = buildbotURL
-        self.customBuildProperties = customBuildProperties
 
         # self.slaves: Disconnect any that were attached and removed from the
         # list. Update self.checker with the new list of passwords, including




From warner at users.sourceforge.net  Thu May 22 22:12:54 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:54 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status builder.py, 1.107, 1.108
Message-ID: <E1JzJ1r-00032H-1c@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17173/buildbot/status

Modified Files:
	builder.py 
Log Message:
[project @ #124:remove-customBuildProperties-unused.patch]
Remove unused and undocumented customBuildProperties config.
This did not allow users to specify global properties; rather, it
specified descriptions for properties that were not used anywhere in
the codebase.

Original author: dustin at v.igoro.us
Date: 2008-04-12 05:50:01+00:00

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- builder.py	22 May 2008 22:12:05 -0000	1.107
+++ builder.py	22 May 2008 22:12:52 -0000	1.108
@@ -1789,8 +1789,6 @@
         return self.botmaster.parent.projectURL
     def getBuildbotURL(self):
         return self.botmaster.parent.buildbotURL
-    def getCustomBuildProperties(self):
-     return self.botmaster.parent.customBuildProperties
 
     def getURLForThing(self, thing):
         prefix = self.getBuildbotURL()




From warner at users.sourceforge.net  Thu May 22 22:12:59 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:59 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status builder.py, 1.108, 1.109
Message-ID: <E1JzJ1w-0005E7-9i@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17197/buildbot/status

Modified Files:
	builder.py 
Log Message:
[project @ #124:properties-class.patch]
Add and use a Properties class, refactor the way properties are rendered,
and update unit tests accordingly.

Original author: dustin at v.igoro.us
Date: 2008-04-12 20:58:59+00:00

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- builder.py	22 May 2008 22:12:52 -0000	1.108
+++ builder.py	22 May 2008 22:12:57 -0000	1.109
@@ -5,6 +5,7 @@
 from twisted.persisted import styles
 from twisted.internet import reactor, defer
 from twisted.protocols import basic
+from buildbot.process.properties import Properties
 
 import os, shutil, sys, re, urllib, itertools
 from cPickle import load, dump
@@ -888,7 +889,7 @@
 
 class BuildStatus(styles.Versioned):
     implements(interfaces.IBuildStatus, interfaces.IStatusEvent)
-    persistenceVersion = 2
+    persistenceVersion = 3
 
     source = None
     reason = None
@@ -924,7 +925,7 @@
         self.finishedWatchers = []
         self.steps = []
         self.testResults = {}
-        self.properties = {}
+        self.properties = Properties()
 
     # IBuildStatus
 
@@ -937,6 +938,9 @@
     def getProperty(self, propname):
         return self.properties[propname]
 
+    def getProperties(self):
+        return self.properties
+
     def getNumber(self):
         return self.number
 
@@ -1074,8 +1078,8 @@
         self.steps.append(s)
         return s
 
-    def setProperty(self, propname, value):
-        self.properties[propname] = value
+    def setProperty(self, propname, value, source):
+        self.properties.setProperty(propname, value, source)
 
     def addTestResult(self, result):
         self.testResults[result.getName()] = result
@@ -1229,6 +1233,12 @@
     def upgradeToVersion2(self):
         self.properties = {}
 
+    def upgradeToVersion3(self):
+        # in version 3, self.properties became a Properties object
+        propdict = self.properties
+        self.properties = Properties()
+        self.properties.update(propdict)
+
     def upgradeLogfiles(self):
         # upgrade any LogFiles that need it. This must occur after we've been
         # attached to our Builder, and after we know about all LogFiles of




From warner at users.sourceforge.net  Thu May 22 22:12:59 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:59 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_properties.py, 1.13,
	1.14 test_steps.py, 1.47, 1.48 test_vc.py, 1.87, 1.88
Message-ID: <E1JzJ1w-0005EL-Ko@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17197/buildbot/test

Modified Files:
	test_properties.py test_steps.py test_vc.py 
Log Message:
[project @ #124:properties-class.patch]
Add and use a Properties class, refactor the way properties are rendered,
and update unit tests accordingly.

Original author: dustin at v.igoro.us
Date: 2008-04-12 20:58:59+00:00

Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- test_properties.py	22 May 2008 22:11:36 -0000	1.13
+++ test_properties.py	22 May 2008 22:12:57 -0000	1.14
@@ -6,7 +6,8 @@
 
 from buildbot.sourcestamp import SourceStamp
 from buildbot.process import base
-from buildbot.steps.shell import ShellCommand, WithProperties
+from buildbot.process.properties import WithProperties, Properties
+from buildbot.steps.shell import ShellCommand
 from buildbot.status import builder
 from buildbot.slave.commands import rmdirRecursive
 from buildbot.test.runutils import RunMixin
@@ -26,7 +27,97 @@
 class FakeScheduler:
     name = "fakescheduler"
 
-class Interpolate(unittest.TestCase):
+class TestProperties(unittest.TestCase):
+    def setUp(self):
+        self.props = Properties()
+
+    def testDictBehavior(self):
+        self.props.setProperty("do-tests", 1, "scheduler")
+        self.props.setProperty("do-install", 2, "scheduler")
+
+        self.assert_(self.props.has_key('do-tests'))
+        self.failUnlessEqual(self.props['do-tests'], 1)
+        self.failUnlessEqual(self.props['do-install'], 2)
+        self.assertRaises(KeyError, lambda : self.props['do-nothing'])
+        self.failUnlessEqual(self.props.getProperty('do-install'), (2, 'scheduler'))
+
+    def testEmpty(self):
+        # test the special case for Null
+        self.props.setProperty("x", None, "hi")
+        self.failUnlessEqual(self.props.getProperty('x'), (None, 'hi'))
+        self.failUnlessEqual(self.props['x'], '')
+
+    def testUpdate(self):
+        self.props.setProperty("x", 24, "old")
+        newprops = { 'a' : 1, 'b' : 2 }
+        self.props.update(newprops, "new")
+
+        self.failUnlessEqual(self.props.getProperty('x'), (24, 'old'))
+        self.failUnlessEqual(self.props.getProperty('a'), (1, 'new'))
+
+    def testUpdateFromProperties(self):
+        self.props.setProperty("x", 24, "old")
+        newprops = Properties()
+        newprops.setProperty('a', 1, "new")
+        newprops.setProperty('b', 2, "new")
+        self.props.updateFromProperties(newprops)
+
+        self.failUnlessEqual(self.props.getProperty('x'), (24, 'old'))
+        self.failUnlessEqual(self.props.getProperty('a'), (1, 'new'))
+
+    # render() is pretty well tested by TestWithProperties
+
+class TestWithProperties(unittest.TestCase):
+    def setUp(self):
+        self.props = Properties()
+
+    def testBasic(self):
+        # test basic substitution with WithProperties
+        self.props.setProperty("revision", "47", "test")
+        command = WithProperties("build-%s.tar.gz", "revision")
+        self.failUnlessEqual(self.props.render(command),
+                             "build-47.tar.gz")
+
+    def testDict(self):
+        # test dict-style substitution with WithProperties
+        self.props.setProperty("other", "foo", "test")
+        command = WithProperties("build-%(other)s.tar.gz")
+        self.failUnlessEqual(self.props.render(command),
+                             "build-foo.tar.gz")
+
+    def testEmpty(self):
+        # None should render as ''
+        self.props.setProperty("empty", None, "test")
+        command = WithProperties("build-%(empty)s.tar.gz")
+        self.failUnlessEqual(self.props.render(command),
+                             "build-.tar.gz")
+
+    def testRecursiveList(self):
+        self.props.setProperty("x", 10, "test")
+        self.props.setProperty("y", 20, "test")
+        command = [ WithProperties("%(x)s %(y)s"), "and",
+                    WithProperties("%(y)s %(x)s") ]
+        self.failUnlessEqual(self.props.render(command),
+                             ["10 20", "and", "20 10"])
+
+    def testRecursiveTuple(self):
+        self.props.setProperty("x", 10, "test")
+        self.props.setProperty("y", 20, "test")
+        command = ( WithProperties("%(x)s %(y)s"), "and",
+                    WithProperties("%(y)s %(x)s") )
+        self.failUnlessEqual(self.props.render(command),
+                             ("10 20", "and", "20 10"))
+
+    def testRecursiveDict(self):
+        self.props.setProperty("x", 10, "test")
+        self.props.setProperty("y", 20, "test")
+        command = { WithProperties("%(x)s %(y)s") : 
+                    WithProperties("%(y)s %(x)s") }
+        self.failUnlessEqual(self.props.render(command),
+                             {"10 20" : "20 10"})
+
+class BuildProperties(unittest.TestCase):
+    """Test the properties that a build should have."""
     def setUp(self):
         self.builder = FakeBuilder()
         self.builder_status = builder.BuilderStatus("fakebuilder")
@@ -36,89 +127,21 @@
         os.mkdir(self.builder_status.basedir)
         self.build_status = self.builder_status.newBuild()
         req = base.BuildRequest("reason", SourceStamp(branch="branch2",
-                                                      revision=1234))
+                                                      revision="1234"))
         self.build = base.Build([req])
         self.build.setBuilder(self.builder)
         self.build.setupStatus(self.build_status)
         self.build.setupSlaveBuilder(FakeSlaveBuilder())
 
-    def testWithProperties(self):
-        self.build.setProperty("revision", 47)
-        self.failUnlessEqual(self.build_status.getProperty("revision"), 47)
-        c = ShellCommand(workdir=dir,
-                         command=["tar", "czf",
-                                  WithProperties("build-%s.tar.gz",
-                                                 "revision"),
-                                  "source"])
-        c.setBuild(self.build)
-        cmd = c._interpolateProperties(c.command)
-        self.failUnlessEqual(cmd,
-                             ["tar", "czf", "build-47.tar.gz", "source"])
+    def testProperties(self):
+        # if not started from a scheduler, the 'scheduler' property
+        # should be 'none'
         self.failUnlessEqual(self.build.getProperty("scheduler"), "none")
-
-    def testWorkdir(self):
-        self.build.setProperty("revision", 47)
-        self.failUnlessEqual(self.build_status.getProperty("revision"), 47)
-        c = ShellCommand(command=["tar", "czf", "foo.tar.gz", "source"])
-        c.setBuild(self.build)
-        workdir = WithProperties("workdir-%d", "revision")
-        workdir = c._interpolateWorkdir(workdir)
-        self.failUnlessEqual(workdir, "workdir-47")
-
-    def testWithPropertiesDict(self):
-        self.build.setProperty("other", "foo")
-        self.build.setProperty("missing", None)
-        c = ShellCommand(workdir=dir,
-                         command=["tar", "czf",
-                                  WithProperties("build-%(other)s.tar.gz"),
-                                  "source"])
-        c.setBuild(self.build)
-        cmd = c._interpolateProperties(c.command)
-        self.failUnlessEqual(cmd,
-                             ["tar", "czf", "build-foo.tar.gz", "source"])
-
-    def testWithPropertiesEmpty(self):
-        self.build.setProperty("empty", None)
-        c = ShellCommand(workdir=dir,
-                         command=["tar", "czf",
-                                  WithProperties("build-%(empty)s.tar.gz"),
-                                  "source"])
-        c.setBuild(self.build)
-        cmd = c._interpolateProperties(c.command)
-        self.failUnlessEqual(cmd,
-                             ["tar", "czf", "build-.tar.gz", "source"])
-
-    def testSourceStamp(self):
-        c = ShellCommand(workdir=dir,
-                         command=["touch",
-                                  WithProperties("%s-dir", "branch"),
-                                  WithProperties("%s-rev", "revision"),
-                                  ])
-        c.setBuild(self.build)
-        cmd = c._interpolateProperties(c.command)
-        self.failUnlessEqual(cmd,
-                             ["touch", "branch2-dir", "1234-rev"])
-
-    def testSlaveName(self):
-        c = ShellCommand(workdir=dir,
-                         command=["touch",
-                                  WithProperties("%s-slave", "slavename"),
-                                  ])
-        c.setBuild(self.build)
-        cmd = c._interpolateProperties(c.command)
-        self.failUnlessEqual(cmd,
-                             ["touch", "bot12-slave"])
-
-    def testBuildNumber(self):
-        c = ShellCommand(workdir=dir,
-                         command=["touch",
-                                  WithProperties("build-%d", "buildnumber"),
-                                  WithProperties("builder-%s", "buildername"),
-                                  ])
-        c.setBuild(self.build)
-        cmd = c._interpolateProperties(c.command)
-        self.failUnlessEqual(cmd,
-                             ["touch", "build-5", "builder-fakebuilder"])
+        self.failUnlessEqual(self.build.getProperty("branch"), "branch2")
+        self.failUnlessEqual(self.build.getProperty("revision"), "1234")
+        self.failUnlessEqual(self.build.getProperty("slavename"), "bot12")
+        self.failUnlessEqual(self.build.getProperty("buildnumber"), 5)
+        self.failUnlessEqual(self.build.getProperty("buildername"), "fakebuilder")
 
 class SchedulerTest(unittest.TestCase):
     def setUp(self):

Index: test_steps.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_steps.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- test_steps.py	23 Dec 2007 08:35:31 -0000	1.47
+++ test_steps.py	22 May 2008 22:12:57 -0000	1.48
@@ -236,13 +236,13 @@
         s = makeBuildStep("test_steps.Steps.test_getProperty")
         bs = s.step_status.getBuild()
 
-        s.setProperty("prop1", "value1")
-        s.setProperty("prop2", "value2")
+        s.setProperty("prop1", "value1", "test")
+        s.setProperty("prop2", "value2", "test")
         self.failUnlessEqual(s.getProperty("prop1"), "value1")
         self.failUnlessEqual(bs.getProperty("prop1"), "value1")
         self.failUnlessEqual(s.getProperty("prop2"), "value2")
         self.failUnlessEqual(bs.getProperty("prop2"), "value2")
-        s.setProperty("prop1", "value1a")
+        s.setProperty("prop1", "value1a", "test")
         self.failUnlessEqual(s.getProperty("prop1"), "value1a")
         self.failUnlessEqual(bs.getProperty("prop1"), "value1a")
 
@@ -601,7 +601,7 @@
 line 23: warning: we are now on line 23
 ending line
 """
-        step.setProperty("warnings-count", 10)
+        step.setProperty("warnings-count", 10, "test")
         log = step.addLog("stdio")
         log.addStdout(output)
         log.finish()

Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- test_vc.py	30 Mar 2008 01:30:00 -0000	1.87
+++ test_vc.py	22 May 2008 22:12:57 -0000	1.88
@@ -541,8 +541,8 @@
         self.shouldExist(self.workdir, "subdir", "subdir.c")
         if self.metadir:
             self.shouldExist(self.workdir, self.metadir)
-        self.failUnlessEqual(bs.getProperty("revision"), None)
-        self.failUnlessEqual(bs.getProperty("branch"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), '')
+        self.failUnlessEqual(bs.getProperty("branch"), '')
         self.checkGotRevisionIsLatest(bs)
 
         self.touch(self.workdir, "newfile")
@@ -565,8 +565,8 @@
         self.shouldExist(self.workdir, "subdir", "subdir.c")
         if self.metadir:
             self.shouldExist(self.workdir, self.metadir)
-        self.failUnlessEqual(bs.getProperty("revision"), self.helper.trunk[0])
-        self.failUnlessEqual(bs.getProperty("branch"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), self.helper.trunk[0] or '')
+        self.failUnlessEqual(bs.getProperty("branch"), '')
         self.checkGotRevision(bs, self.helper.trunk[0])
         # leave the tree at HEAD
         return self.doBuild()
@@ -585,7 +585,7 @@
                            "version=%d" % self.helper.version)
         if self.metadir:
             self.shouldExist(self.workdir, self.metadir)
-        self.failUnlessEqual(bs.getProperty("revision"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), '')
         self.checkGotRevisionIsLatest(bs)
 
         self.touch(self.workdir, "newfile")
@@ -609,7 +609,7 @@
         self.shouldContain(self.workdir, "version.c",
                            "version=%d" % self.helper.version)
         self.shouldExist(self.workdir, "newfile")
-        self.failUnlessEqual(bs.getProperty("revision"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), '')
         self.checkGotRevisionIsLatest(bs)
 
         # now "update" to an older revision
@@ -623,7 +623,7 @@
         self.shouldContain(self.workdir, "version.c",
                            "version=%d" % (self.helper.version-1))
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.trunk[-2])
+                             self.helper.trunk[-2] or '')
         self.checkGotRevision(bs, self.helper.trunk[-2])
 
         # now update to the newer revision
@@ -637,7 +637,7 @@
         self.shouldContain(self.workdir, "version.c",
                            "version=%d" % self.helper.version)
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.trunk[-1])
+                             self.helper.trunk[-1] or '')
         self.checkGotRevision(bs, self.helper.trunk[-1])
 
 
@@ -674,7 +674,7 @@
         self.shouldNotExist(self.workdir, "newfile")
         self.touch(self.workdir, "newfile")
         self.touch(self.vcdir, "newvcfile")
-        self.failUnlessEqual(bs.getProperty("revision"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), '')
         self.checkGotRevisionIsLatest(bs)
 
         d = self.doBuild() # copy rebuild clobbers new files
@@ -687,7 +687,7 @@
         self.shouldNotExist(self.workdir, "newfile")
         self.shouldExist(self.vcdir, "newvcfile")
         self.shouldExist(self.workdir, "newvcfile")
-        self.failUnlessEqual(bs.getProperty("revision"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), '')
         self.checkGotRevisionIsLatest(bs)
         self.touch(self.workdir, "newfile")
 
@@ -698,7 +698,7 @@
     def _do_vctest_export_1(self, bs):
         self.shouldNotExist(self.workdir, self.metadir)
         self.shouldNotExist(self.workdir, "newfile")
-        self.failUnlessEqual(bs.getProperty("revision"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), '')
         #self.checkGotRevisionIsLatest(bs)
         # VC 'export' is not required to have a got_revision
         self.touch(self.workdir, "newfile")
@@ -709,7 +709,7 @@
     def _do_vctest_export_2(self, bs):
         self.shouldNotExist(self.workdir, self.metadir)
         self.shouldNotExist(self.workdir, "newfile")
-        self.failUnlessEqual(bs.getProperty("revision"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), '')
         #self.checkGotRevisionIsLatest(bs)
         # VC 'export' is not required to have a got_revision
 
@@ -744,7 +744,7 @@
         data = open(subdir_c, "r").read()
         self.failUnlessIn("Hello patched subdir.\\n", data)
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.trunk[-1])
+                             self.helper.trunk[-1] or '')
         self.checkGotRevision(bs, self.helper.trunk[-1])
 
         # make sure that a rebuild does not use the leftover patched workdir
@@ -758,7 +758,7 @@
                                 "subdir", "subdir.c")
         data = open(subdir_c, "r").read()
         self.failUnlessIn("Hello subdir.\\n", data)
-        self.failUnlessEqual(bs.getProperty("revision"), None)
+        self.failUnlessEqual(bs.getProperty("revision"), '')
         self.checkGotRevisionIsLatest(bs)
 
         # now make sure we can patch an older revision. We need at least two
@@ -783,7 +783,7 @@
         data = open(subdir_c, "r").read()
         self.failUnlessIn("Hello patched subdir.\\n", data)
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.trunk[-2])
+                             self.helper.trunk[-2] or '')
         self.checkGotRevision(bs, self.helper.trunk[-2])
 
         # now check that we can patch a branch
@@ -802,8 +802,8 @@
         data = open(subdir_c, "r").read()
         self.failUnlessIn("Hello patched subdir.\\n", data)
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.branch[-1])
-        self.failUnlessEqual(bs.getProperty("branch"), self.helper.branchname)
+                             self.helper.branch[-1] or '')
+        self.failUnlessEqual(bs.getProperty("branch"), self.helper.branchname or '')
         self.checkGotRevision(bs, self.helper.branch[-1])
 
 




From warner at users.sourceforge.net  Thu May 22 22:12:59 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:59 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps python.py, 1.5,
	1.6 shell.py, 1.21, 1.22 source.py, 1.13, 1.14 transfer.py,
	1.13, 1.14
Message-ID: <E1JzJ1w-0005EU-MY@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17197/buildbot/steps

Modified Files:
	python.py shell.py source.py transfer.py 
Log Message:
[project @ #124:properties-class.patch]
Add and use a Properties class, refactor the way properties are rendered,
and update unit tests accordingly.

Original author: dustin at v.igoro.us
Date: 2008-04-12 20:58:59+00:00

Index: python.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/python.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- python.py	5 Oct 2006 00:45:48 -0000	1.5
+++ python.py	22 May 2008 22:12:57 -0000	1.6
@@ -96,8 +96,8 @@
             if counts[m]:
                 self.descriptionDone.append("%s=%d" % (m, counts[m]))
                 self.addCompleteLog(m, "".join(summaries[m]))
-            self.setProperty("pyflakes-%s" % m, counts[m])
-        self.setProperty("pyflakes-total", sum(counts.values()))
+            self.setProperty("pyflakes-%s" % m, counts[m], "pyflakes")
+        self.setProperty("pyflakes-total", sum(counts.values()), "pyflakes")
 
 
     def evaluateCommand(self, cmd):

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- shell.py	22 May 2008 22:12:46 -0000	1.21
+++ shell.py	22 May 2008 22:12:57 -0000	1.22
@@ -2,12 +2,12 @@
 
 import re
 from twisted.python import log
-from buildbot.process.buildstep import LoggingBuildStep, RemoteShellCommand, \
-     render_properties
+from buildbot.process.buildstep import LoggingBuildStep, RemoteShellCommand
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE
 
-# for existing configurations that import WithProperties from here
-from buildbot.process.buildstep import WithProperties
+# for existing configurations that import WithProperties from here.  We like
+# to move this class around just to keep our readers guessing.
+from buildbot.process.properties import WithProperties
 
 class ShellCommand(LoggingBuildStep):
     """I run a single shell command on the buildslave. I return FAILURE if
@@ -118,11 +118,12 @@
         if self.description is not None:
             return self.description
 
+        properties = self.build.getProperties()
         words = self.command
         if isinstance(words, (str, unicode)):
             words = words.split()
         # render() each word to handle WithProperties objects
-        words = [render_properties(word, self.build) for word in words]
+        words = [properties.render(word) for word in words]
         if len(words) < 1:
             return ["???"]
         if len(words) == 1:
@@ -131,45 +132,18 @@
             return ["'%s" % words[0], "%s'" % words[1]]
         return ["'%s" % words[0], "%s" % words[1], "...'"]
 
-    def _interpolateProperties(self, value):
-        """
-        Expand the L{WithProperties} objects in L{value}
-        """
-        if isinstance(value, (str, unicode, bool, int, float, type(None))):
-            return value
-
-        if isinstance(value, list):
-            return [self._interpolateProperties(val) for val in value]
-
-        if isinstance(value, tuple):
-            return tuple([self._interpolateProperties(val) for val in value])
-
-        if isinstance(value, dict):
-            new_dict = { }
-            for key, val in value.iteritems():
-                new_key = self._interpolateProperties(key)
-                new_dict[new_key] = self._interpolateProperties(val)
-            return new_dict
-
-        # To make sure we catch anything we forgot
-        assert isinstance(value, WithProperties), \
-               "%s (%s) is not a WithProperties" % (value, type(value))
-
-        return value.render(self.build)
-
-    def _interpolateWorkdir(self, workdir):
-        return render_properties(workdir, self.build)
-
     def setupEnvironment(self, cmd):
+        # XXX is this used? documented? replaced by properties?
         # merge in anything from Build.slaveEnvironment . Earlier steps
         # (perhaps ones which compile libraries or sub-projects that need to
         # be referenced by later steps) can add keys to
         # self.build.slaveEnvironment to affect later steps.
+        properties = self.build.getProperties()
         slaveEnv = self.build.slaveEnvironment
         if slaveEnv:
             if cmd.args['env'] is None:
                 cmd.args['env'] = {}
-            cmd.args['env'].update(self._interpolateProperties(slaveEnv))
+            cmd.args['env'].update(properties.render(slaveEnv))
             # note that each RemoteShellCommand gets its own copy of the
             # dictionary, so we shouldn't be affecting anyone but ourselves.
 
@@ -199,12 +173,11 @@
         # this block is specific to ShellCommands. subclasses that don't need
         # to set up an argv array, an environment, or extra logfiles= (like
         # the Source subclasses) can just skip straight to startCommand()
-        command = self._interpolateProperties(self.command)
-        assert isinstance(command, (list, tuple, str))
+        properties = self.build.getProperties()
+
         # create the actual RemoteShellCommand instance now
-        kwargs = self._interpolateProperties(self.remote_kwargs)
-        kwargs['workdir'] = self._interpolateWorkdir(kwargs['workdir'])
-        kwargs['command'] = command
+        kwargs = properties.render(self.remote_kwargs)
+        kwargs['command'] = properties.render(self.command)
         kwargs['logfiles'] = self.logfiles
         cmd = RemoteShellCommand(**kwargs)
         self.setupEnvironment(cmd)
@@ -224,7 +197,7 @@
         m = re.search(r'^(\d+)', out)
         if m:
             self.kib = int(m.group(1))
-            self.setProperty("tree-size-KiB", self.kib)
+            self.setProperty("tree-size-KiB", self.kib, "treesize")
 
     def evaluateCommand(self, cmd):
         if cmd.rc != 0:
@@ -298,7 +271,7 @@
             old_count = self.getProperty("warnings-count")
         except KeyError:
             old_count = 0
-        self.setProperty("warnings-count", old_count + self.warnCount)
+        self.setProperty("warnings-count", old_count + self.warnCount, "WarningCountingShellCommand")
 
 
     def evaluateCommand(self, cmd):

Index: source.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/source.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- source.py	29 Apr 2008 20:21:36 -0000	1.13
+++ source.py	22 May 2008 22:12:57 -0000	1.14
@@ -187,7 +187,7 @@
         got_revision = None
         if cmd.updates.has_key("got_revision"):
             got_revision = str(cmd.updates["got_revision"][-1])
-        self.setProperty("got_revision", got_revision)
+        self.setProperty("got_revision", got_revision, "source")
 
 
 

Index: transfer.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/transfer.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- transfer.py	21 Mar 2008 03:53:36 -0000	1.13
+++ transfer.py	22 May 2008 22:12:57 -0000	1.14
@@ -4,8 +4,7 @@
 from twisted.internet import reactor
 from twisted.spread import pb
 from twisted.python import log
-from buildbot.process.buildstep import RemoteCommand, BuildStep, \
-     render_properties
+from buildbot.process.buildstep import RemoteCommand, BuildStep
 from buildbot.process.buildstep import SUCCESS, FAILURE
 from buildbot.interfaces import BuildSlaveTooOldError
 
@@ -111,12 +110,14 @@
 
     def start(self):
         version = self.slaveVersion("uploadFile")
+        properties = self.build.getProperties()
+
         if not version:
             m = "slave is too old, does not know about uploadFile"
             raise BuildSlaveTooOldError(m)
 
-        source = render_properties(self.slavesrc, self.build)
-        masterdest = render_properties(self.masterdest, self.build)
+        source = properties.render(self.slavesrc)
+        masterdest = properties.render(self.masterdest)
         # we rely upon the fact that the buildmaster runs chdir'ed into its
         # basedir to make sure that relative paths in masterdest are expanded
         # properly. TODO: maybe pass the master's basedir all the way down
@@ -237,6 +238,8 @@
         self.mode = mode
 
     def start(self):
+        properties = self.build.getProperties()
+
         version = self.slaveVersion("downloadFile")
         if not version:
             m = "slave is too old, does not know about downloadFile"
@@ -244,9 +247,8 @@
 
         # we are currently in the buildmaster's basedir, so any non-absolute
         # paths will be interpreted relative to that
-        source = os.path.expanduser(render_properties(self.mastersrc,
-                                                      self.build))
-        slavedest = render_properties(self.slavedest, self.build)
+        source = os.path.expanduser(properties.render(self.mastersrc))
+        slavedest = properties.render(self.slavedest)
         log.msg("FileDownload started, from master %r to slave %r" %
                 (source, slavedest))
 




From warner at users.sourceforge.net  Thu May 22 22:12:59 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:12:59 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process properties.py, NONE,
	1.1 base.py, 1.80, 1.81 buildstep.py, 1.11, 1.12
Message-ID: <E1JzJ1x-00036n-KX@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17197/buildbot/process

Modified Files:
	base.py buildstep.py 
Added Files:
	properties.py 
Log Message:
[project @ #124:properties-class.patch]
Add and use a Properties class, refactor the way properties are rendered,
and update unit tests accordingly.

Original author: dustin at v.igoro.us
Date: 2008-04-12 20:58:59+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- base.py	22 May 2008 22:12:34 -0000	1.80
+++ base.py	22 May 2008 22:12:57 -0000	1.81
@@ -207,15 +207,18 @@
     def getSourceStamp(self):
         return self.source
 
-    def setProperty(self, propname, value):
+    def setProperty(self, propname, value, source):
         """Set a property on this build. This may only be called after the
         build has started, so that it has a BuildStatus object where the
         properties can live."""
-        self.build_status.setProperty(propname, value)
+        self.build_status.setProperty(propname, value, source)
 
     def getCustomProperties(self):
         return self.custom_properties
 
+    def getProperties(self):
+        return self.build_status.getProperties()
+
     def getProperty(self, propname):
         return self.build_status.properties[propname]
 
@@ -277,22 +280,22 @@
 
     def setupStatus(self, build_status):
         self.build_status = build_status
-        self.setProperty("buildername", self.builder.name)
-        self.setProperty("buildnumber", self.build_status.number)
-        self.setProperty("branch", self.source.branch)
-        self.setProperty("revision", self.source.revision)
+        self.setProperty("buildername", self.builder.name, "build")
+        self.setProperty("buildnumber", self.build_status.number, "build")
+        self.setProperty("branch", self.source.branch, "build")
+        self.setProperty("revision", self.source.revision, "build")
         if self.scheduler is None:
-            self.setProperty("scheduler", "none")
+            self.setProperty("scheduler", "none", "build")
         else:
-            self.setProperty("scheduler", self.scheduler.name)
+            self.setProperty("scheduler", self.scheduler.name, "build")
         for key, userProp in self.custom_properties.items():
-            self.setProperty(key, userProp)
+            self.setProperty(key, userProp, "custom_props")
 
     def setupSlaveBuilder(self, slavebuilder):
         self.slavebuilder = slavebuilder
         self.slavename = slavebuilder.slave.slavename
         self.build_status.setSlavename(self.slavename)
-        self.setProperty("slavename", self.slavename)
+        self.setProperty("slavename", self.slavename, "build")
 
     def startBuild(self, build_status, expectations, slavebuilder):
         """This method sets up the build, then starts it by invoking the

Index: buildstep.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/buildstep.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- buildstep.py	23 Mar 2008 00:36:56 -0000	1.11
+++ buildstep.py	22 May 2008 22:12:57 -0000	1.12
@@ -632,8 +632,8 @@
     def getProperty(self, propname):
         return self.build.getProperty(propname)
 
-    def setProperty(self, propname, value):
-        self.build.setProperty(propname, value)
+    def setProperty(self, propname, value, source):
+        self.build.setProperty(propname, value, source)
 
     def startStep(self, remote):
         """Begin the step. This returns a Deferred that will fire when the
@@ -1092,46 +1092,5 @@
         self.step_status.setText(self.getText(cmd, results))
         self.step_status.setText2(self.maybeGetText2(cmd, results))
 
-class _BuildPropertyMapping:
-    def __init__(self, build):
-        self.build = build
-    def __getitem__(self, name):
-        p = self.build.getProperty(name)
-        if p is None:
-            p = ""
-        return p
-
-class WithProperties(util.ComparableMixin):
-    """This is a marker class, used in ShellCommand's command= argument to
-    indicate that we want to interpolate a build property.
-    """
-
-    compare_attrs = ('fmtstring', 'args')
-
-    def __init__(self, fmtstring, *args):
-        self.fmtstring = fmtstring
-        self.args = args
-
-    def render(self, build):
-        pmap = _BuildPropertyMapping(build)
-        if self.args:
-            strings = []
-            for name in self.args:
-                strings.append(pmap[name])
-            s = self.fmtstring % tuple(strings)
-        else:
-            s = self.fmtstring % pmap
-        return s
-
-def render_properties(s, build):
-    """Return a string based on s and build that is suitable for use
-    in a running BuildStep.  If s is a string, return s.  If s is a
-    WithProperties object, return the result of s.render(build).
-    Otherwise, return str(s).
-    """
-    if isinstance(s, (str, unicode)):
-        return s
-    elif isinstance(s, WithProperties):
-        return s.render(build)
-    else:
-        return str(s)
+# (WithProeprties used to be available in this module)
+from buildbot.process.properties import WithProperties

--- NEW FILE: properties.py ---
from zope.interface import implements
from buildbot import util
from twisted.python import log
from twisted.python.failure import Failure

class Properties:
    """
    I represent a set of properties that can be interpolated into various
    strings in buildsteps.

    @ivar properties: dictionary mapping property values to tuples 
        (value, source), where source is a string identifing the source
        of the property.

    Objects of this class can be read like a dictionary -- in this case,
    only the property value is returned.

    As a special case, a property value of None is returned as an empty 
    string when used as a mapping.
    """
    def __init__(self):
        self.properties = {}

    def __getitem__(self, name):
        """Just get the value for this property, special-casing None -> ''"""
        rv = self.properties[name][0]
        if rv is None: rv = ''
        return rv

    def has_key(self, name):
        return self.properties.has_key(name)

    def getProperty(self, name, default=(None,None)):
        """Get the (value, source) tuple for the given property"""
        return self.properties.get(name, default)

    def setProperty(self, name, value, source):
        self.properties[name] = (value, source)

    def update(self, dict, source):
        """Update this object from a dictionary, with an explicit source specified."""
        for k, v in dict.items():
            self.properties[k] = (v, source)

    def updateFromProperties(self, other):
        """Update this object based on another object; the other object's """
        self.properties.update(other.properties)

    def render(self, value):
        """
        Return a variant of value that has any WithProperties objects
        substituted.  This recurses into Python's compound data types.
        """
        if isinstance(value, (str, unicode)):
            return value
        elif isinstance(value, WithProperties):
            return value.render(self)
        elif isinstance(value, list):
            return [ self.render(e) for e in value ]
        elif isinstance(value, tuple):
            return tuple([ self.render(e) for e in value ])
        elif isinstance(value, dict):
            return dict([ (self.render(k), self.render(v)) for k,v in value.iteritems() ])
        else:
            return value

class WithProperties(util.ComparableMixin):
    """This is a marker class, used in ShellCommand's command= argument to
    indicate that we want to interpolate a build property.
    """

    compare_attrs = ('fmtstring', 'args')

    def __init__(self, fmtstring, *args):
        self.fmtstring = fmtstring
        self.args = args

    def render(self, properties):
        if self.args:
            strings = []
            for name in self.args:
                strings.append(properties[name])
            s = self.fmtstring % tuple(strings)
        else:
            s = self.fmtstring % properties
        return s




From warner at users.sourceforge.net  Thu May 22 22:13:04 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:04 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_properties.py, 1.14,
	1.15
Message-ID: <E1JzJ20-0003DD-TY@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17238/buildbot/test

Modified Files:
	test_properties.py 
Log Message:
[project @ #124:getProperty-returns-property-only.patch]
Change Property.getProperty to just return the property value, since
having getProperty return different things on different objects is
confusing.

Original author: dustin at v.igoro.us
Date: 2008-04-12 22:11:03+00:00

Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- test_properties.py	22 May 2008 22:12:57 -0000	1.14
+++ test_properties.py	22 May 2008 22:13:02 -0000	1.15
@@ -39,12 +39,12 @@
         self.failUnlessEqual(self.props['do-tests'], 1)
         self.failUnlessEqual(self.props['do-install'], 2)
         self.assertRaises(KeyError, lambda : self.props['do-nothing'])
-        self.failUnlessEqual(self.props.getProperty('do-install'), (2, 'scheduler'))
+        self.failUnlessEqual(self.props.getProperty('do-install'), 2)
 
     def testEmpty(self):
         # test the special case for Null
         self.props.setProperty("x", None, "hi")
-        self.failUnlessEqual(self.props.getProperty('x'), (None, 'hi'))
+        self.failUnlessEqual(self.props.getProperty('x'), None)
         self.failUnlessEqual(self.props['x'], '')
 
     def testUpdate(self):
@@ -52,8 +52,10 @@
         newprops = { 'a' : 1, 'b' : 2 }
         self.props.update(newprops, "new")
 
-        self.failUnlessEqual(self.props.getProperty('x'), (24, 'old'))
-        self.failUnlessEqual(self.props.getProperty('a'), (1, 'new'))
+        self.failUnlessEqual(self.props.getProperty('x'), 24)
+        self.failUnlessEqual(self.props.getPropertySource('x'), 'old')
+        self.failUnlessEqual(self.props.getProperty('a'), 1)
+        self.failUnlessEqual(self.props.getPropertySource('a'), 'new')
 
     def testUpdateFromProperties(self):
         self.props.setProperty("x", 24, "old")
@@ -62,8 +64,10 @@
         newprops.setProperty('b', 2, "new")
         self.props.updateFromProperties(newprops)
 
-        self.failUnlessEqual(self.props.getProperty('x'), (24, 'old'))
-        self.failUnlessEqual(self.props.getProperty('a'), (1, 'new'))
+        self.failUnlessEqual(self.props.getProperty('x'), 24)
+        self.failUnlessEqual(self.props.getPropertySource('x'), 'old')
+        self.failUnlessEqual(self.props.getProperty('a'), 1)
+        self.failUnlessEqual(self.props.getPropertySource('a'), 'new')
 
     # render() is pretty well tested by TestWithProperties
 




From warner at users.sourceforge.net  Thu May 22 22:13:04 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:04 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process properties.py, 1.1, 1.2
Message-ID: <E1JzJ20-0005Jz-T7@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17238/buildbot/process

Modified Files:
	properties.py 
Log Message:
[project @ #124:getProperty-returns-property-only.patch]
Change Property.getProperty to just return the property value, since
having getProperty return different things on different objects is
confusing.

Original author: dustin at v.igoro.us
Date: 2008-04-12 22:11:03+00:00

Index: properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/properties.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- properties.py	22 May 2008 22:12:57 -0000	1.1
+++ properties.py	22 May 2008 22:13:02 -0000	1.2
@@ -30,9 +30,12 @@
     def has_key(self, name):
         return self.properties.has_key(name)
 
-    def getProperty(self, name, default=(None,None)):
-        """Get the (value, source) tuple for the given property"""
-        return self.properties.get(name, default)
+    def getProperty(self, name, default=None):
+        """Get the value for the given property, with no None -> '' special case"""
+        return self.properties.get(name, default)[0]
+
+    def getPropertySource(self, name):
+        return self.properties[name][1]
 
     def setProperty(self, name, value, source):
         self.properties[name] = (value, source)




From warner at users.sourceforge.net  Thu May 22 22:13:08 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:08 +0000
Subject: [Buildbot-commits] buildbot/buildbot buildset.py, 1.8,
	1.9 buildslave.py, 1.10, 1.11 scheduler.py, 1.30, 1.31
Message-ID: <E1JzJ25-0003F2-0v@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17543/buildbot

Modified Files:
	buildset.py buildslave.py scheduler.py 
Log Message:
[project @ #124:scheduler-properties.patch]
Arrange for properties to come down from schedulers, via BuildStep and
BuildRequest objects.  custom_props are still present, in parallel, but
will go eventually. Triggered builds no longer propagate custom props.

Original author: dustin at v.igoro.us
Date: 2008-04-12 23:46:58+00:00

Index: buildset.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/buildset.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- buildset.py	22 May 2008 22:12:14 -0000	1.8
+++ buildset.py	22 May 2008 22:13:06 -0000	1.9
@@ -11,7 +11,7 @@
     (source.changes=list)."""
 
     def __init__(self, builderNames, source, reason=None, bsid=None,
-                 scheduler=None, custom_props=None):
+                 custom_props=None, properties=None):
         """
         @param source: a L{buildbot.sourcestamp.SourceStamp}
         """
@@ -19,13 +19,12 @@
         self.source = source
         self.reason = reason
 
-        if not custom_props: custom_props = {}
         self.custom_props = custom_props
+        self.properties = properties
 
         self.stillHopeful = True
         self.status = bss = builder.BuildSetStatus(source, reason,
                                                    builderNames, bsid)
-	self.scheduler = scheduler
 
     def waitUntilSuccess(self):
         return self.status.waitUntilSuccess()
@@ -41,8 +40,8 @@
         # create the requests
         for b in builders:
             req = base.BuildRequest(self.reason, self.source, b.name, 
-                                    scheduler=self.scheduler,
-                                    custom_props=self.custom_props)
+                                    custom_props=self.custom_props,
+                                    properties=self.properties)
             reqs.append((b, req))
             self.requests.append(req)
             d = req.waitUntilFinished()

Index: buildslave.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/buildslave.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- buildslave.py	18 Mar 2008 21:41:15 -0000	1.10
+++ buildslave.py	22 May 2008 22:13:06 -0000	1.11
@@ -11,6 +11,7 @@
 from buildbot.status.builder import SlaveStatus
 from buildbot.status.mail import MailNotifier
 from buildbot.interfaces import IBuildSlave
+from buildbot.process.properties import Properties
 
 class BuildSlave(NewCredPerspective, service.MultiService):
     """This is the master-side representative for a remote buildbot slave.
@@ -26,7 +27,8 @@
     implements(IBuildSlave)
 
     def __init__(self, name, password, max_builds=None,
-                 notify_on_missing=[], missing_timeout=3600):
+                 notify_on_missing=[], missing_timeout=3600,
+                 properties={}):
         """
         @param name: botname this machine will supply when it connects
         @param password: password this machine will supply when
@@ -34,6 +36,9 @@
         @param max_builds: maximum number of simultaneous builds that will
                            be run concurrently on this buildslave (the
                            default is None for no limit)
+        @param properties: properties that will be applied to builds run on 
+                           this slave
+        @type properties: dictionary
         """
         service.MultiService.__init__(self)
         self.slavename = name
@@ -44,6 +49,11 @@
         self.slave_commands = None
         self.slavebuilders = []
         self.max_builds = max_builds
+
+        self.properties = Properties()
+        self.properties.update(properties, "BuildSlave")
+        self.properties.setProperty("slavename", name, "BuildSlave")
+
         self.lastMessageReceived = 0
         if isinstance(notify_on_missing, str):
             notify_on_missing = [notify_on_missing]

Index: scheduler.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scheduler.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- scheduler.py	22 May 2008 22:12:05 -0000	1.30
+++ scheduler.py	22 May 2008 22:13:06 -0000	1.31
@@ -14,14 +14,33 @@
 from buildbot.status import builder
 from buildbot.sourcestamp import SourceStamp
 from buildbot.changes.maildir import MaildirService
+from buildbot.process.properties import Properties
 
 
 class BaseScheduler(service.MultiService, util.ComparableMixin):
+    """
+    A Schduler creates BuildSets and submits them to the BuildMaster.
+
+    @ivar name: name of the scheduler
+
+    @ivar properties: additional properties specified in this 
+        scheduler's configuration
+    @type properties: Properties object
+    """
     implements(interfaces.IScheduler)
 
-    def __init__(self, name):
+    def __init__(self, name, properties={}):
+        """
+        @param name: name for this scheduler
+
+        @param properties: properties to be propagated from this scheduler
+        @type properties: dict
+        """
         service.MultiService.__init__(self)
         self.name = name
+        self.properties = Properties()
+        self.properties.update(properties, "Scheduler")
+        self.properties.setProperty("scheduler", name, "Scheduler")
 
     def __repr__(self):
         # TODO: why can't id() return a positive number? %d is ugly.
@@ -170,8 +189,7 @@
 
         # create a BuildSet, submit it to the BuildMaster
         bs = buildset.BuildSet(self.builderNames,
-                               SourceStamp(changes=changes),
-                               scheduler=self)
+                               SourceStamp(changes=changes))
         self.submit(bs)
 
     def stopService(self):
@@ -305,7 +323,7 @@
         return d
 
     def upstreamBuilt(self, ss):
-        bs = buildset.BuildSet(self.builderNames, ss, scheduler=self)
+        bs = buildset.BuildSet(self.builderNames, ss)
         self.submit(bs)
 
 
@@ -344,7 +362,7 @@
     def doPeriodicBuild(self):
         bs = buildset.BuildSet(self.builderNames,
                                SourceStamp(branch=self.branch),
-                               self.reason, scheduler=self)
+                               self.reason)
         self.submit(bs)
 
 
@@ -502,7 +520,7 @@
         # And trigger a build
         bs = buildset.BuildSet(self.builderNames,
                                SourceStamp(branch=self.branch),
-                               self.reason, scheduler=self)
+                               self.reason)
         self.submit(bs)
 
     def addChange(self, change):
@@ -624,7 +642,7 @@
                 return
 
         reason = "'try' job"
-        bs = buildset.BuildSet(builderNames, ss, reason=reason, bsid=bsid, scheduler=self)
+        bs = buildset.BuildSet(builderNames, ss, reason=reason, bsid=bsid)
         self.parent.submitBuildSet(bs)
 
 class Try_Userpass(TryBase):
@@ -681,7 +699,6 @@
         bs = buildset.BuildSet(builderNames, 
                                ss,
                                reason=reason, 
-                               scheduler=self,
                                custom_props=custom_props)
 
         self.parent.submitBuildSet(bs)
@@ -710,7 +727,7 @@
         """Trigger this scheduler. Returns a deferred that will fire when the
         buildset is finished.
         """
-        bs = buildset.BuildSet(self.builderNames, ss, scheduler=self, custom_props=custom_props)
+        bs = buildset.BuildSet(self.builderNames, ss, custom_props=custom_props)
         d = bs.waitUntilFinished()
         self.submit(bs)
         return d




From warner at users.sourceforge.net  Thu May 22 22:13:08 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:08 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps trigger.py,1.4,1.5
Message-ID: <E1JzJ25-0005Lg-CF@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17543/buildbot/steps

Modified Files:
	trigger.py 
Log Message:
[project @ #124:scheduler-properties.patch]
Arrange for properties to come down from schedulers, via BuildStep and
BuildRequest objects.  custom_props are still present, in parallel, but
will go eventually. Triggered builds no longer propagate custom props.

Original author: dustin at v.igoro.us
Date: 2008-04-12 23:46:58+00:00

Index: trigger.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/trigger.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- trigger.py	22 May 2008 22:12:05 -0000	1.4
+++ trigger.py	22 May 2008 22:13:06 -0000	1.5
@@ -62,7 +62,6 @@
                 pass
             if got:
                 ss = ss.getAbsoluteSourceStamp(got)
-        custom_props = self.build.getCustomProperties()
         # (is there an easier way to find the BuildMaster?)
         all_schedulers = self.build.builder.botmaster.parent.allSchedulers()
         all_schedulers = dict([(sch.name, sch) for sch in all_schedulers])
@@ -77,7 +76,7 @@
             if all_schedulers.has_key(scheduler):
                 sch = all_schedulers[scheduler]
                 if isinstance(sch, Triggerable):
-                    dl.append(sch.trigger(ss, custom_props))
+                    dl.append(sch.trigger(ss, {})) # TODO: copy some properties, set the rest
                     triggered_schedulers.append(scheduler)
                 else:
                     unknown_schedulers.append(scheduler)




From warner at users.sourceforge.net  Thu May 22 22:13:08 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:08 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process base.py, 1.81,
	1.82 builder.py, 1.53, 1.54 properties.py, 1.2, 1.3
Message-ID: <E1JzJ25-0005Lf-Bs@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17543/buildbot/process

Modified Files:
	base.py builder.py properties.py 
Log Message:
[project @ #124:scheduler-properties.patch]
Arrange for properties to come down from schedulers, via BuildStep and
BuildRequest objects.  custom_props are still present, in parallel, but
will go eventually. Triggered builds no longer propagate custom props.

Original author: dustin at v.igoro.us
Date: 2008-04-12 23:46:58+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- base.py	22 May 2008 22:12:57 -0000	1.81
+++ base.py	22 May 2008 22:13:06 -0000	1.82
@@ -11,6 +11,7 @@
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, EXCEPTION
 from buildbot.status.builder import Results, BuildRequestStatus
 from buildbot.status.progress import BuildProgress
+from buildbot.process.properties import Properties
 
 class BuildRequest:
     """I represent a request to a specific Builder to run a single build.
@@ -39,8 +40,8 @@
                   provide this, but for forced builds the user requesting the
                   build will provide a string.
 
-    @type custom_props: dictionary.
-    @ivar custom_props: custom user properties.
+    @type properties: Properties object
+    @ivar properties: properties that should be applied to this build
 
     @ivar status: the IBuildStatus object which tracks our status
 
@@ -56,18 +57,18 @@
 
     implements(interfaces.IBuildRequestControl)
 
-    def __init__(self, reason, source, builderName=None, scheduler=None, custom_props=None):
+    def __init__(self, reason, source, builderName=None, custom_props=None, properties=None):
         # TODO: remove the =None on builderName, it is there so I don't have
         # to change a lot of tests that create BuildRequest objects
         assert interfaces.ISourceStamp(source, None)
         self.reason = reason
         self.source = source
-        self.scheduler = scheduler
 
-        if not custom_props: custom_props = {}
-        self.custom_props = custom_props
-        assert isinstance(self.custom_props, dict), \
-               "custom_props must be a dict (not %r)" % (self.custom_props,)
+        self.properties = Properties()
+        if properties:
+            self.properties.updateFromProperties(properties)
+        if custom_props:
+            self.properties.update(custom_props, "BuildRequest-custom_props")
 
         self.start_watchers = []
         self.finish_watchers = []
@@ -182,12 +183,6 @@
         # build a source stamp
         self.source = requests[0].mergeWith(requests[1:])
         self.reason = requests[0].mergeReasons(requests[1:])
-        self.scheduler = requests[0].scheduler
-
-        # Set custom properties.
-        self.custom_properties = requests[0].customProps()
-
-        #self.abandoned = False
 
         self.progress = None
         self.currentStep = None
@@ -213,14 +208,11 @@
         properties can live."""
         self.build_status.setProperty(propname, value, source)
 
-    def getCustomProperties(self):
-        return self.custom_properties
-
     def getProperties(self):
         return self.build_status.getProperties()
 
     def getProperty(self, propname):
-        return self.build_status.properties[propname]
+        return self.build_status.getProperty(propname)
 
     def allChanges(self):
         return self.source.changes
@@ -278,24 +270,33 @@
     def getSlaveName(self):
         return self.slavebuilder.slave.slavename
 
-    def setupStatus(self, build_status):
-        self.build_status = build_status
-        self.setProperty("buildername", self.builder.name, "build")
-        self.setProperty("buildnumber", self.build_status.number, "build")
-        self.setProperty("branch", self.source.branch, "build")
-        self.setProperty("revision", self.source.revision, "build")
-        if self.scheduler is None:
-            self.setProperty("scheduler", "none", "build")
-        else:
-            self.setProperty("scheduler", self.scheduler.name, "build")
-        for key, userProp in self.custom_properties.items():
-            self.setProperty(key, userProp, "custom_props")
+    def setupProperties(self):
+        props = self.getProperties()
+
+        #props.updateFromProperties(self.global_properties) TODO
+
+        # get any properties from requests (this is the path through
+        # which schedulers will send us properties)
+        for rq in self.requests:
+            props.updateFromProperties(rq.properties)
+
+        # now set some properties of our own, corresponding to the
+        # build itself
+        props.setProperty("buildername", self.builder.name, "Build")
+        props.setProperty("buildnumber", self.build_status.number, "Build")
+        props.setProperty("branch", self.source.branch, "Build")
+        props.setProperty("revision", self.source.revision, "Build")
 
     def setupSlaveBuilder(self, slavebuilder):
         self.slavebuilder = slavebuilder
+
+        # navigate our way back to the L{buildbot.buildslave.BuildSlave}
+        # object that came from the config, and get its properties
+        buildslave_properties = slavebuilder.slave.properties
+        self.getProperties().updateFromProperties(buildslave_properties)
+
         self.slavename = slavebuilder.slave.slavename
         self.build_status.setSlavename(self.slavename)
-        self.setProperty("slavename", self.slavename, "build")
 
     def startBuild(self, build_status, expectations, slavebuilder):
         """This method sets up the build, then starts it by invoking the
@@ -308,8 +309,9 @@
         # the Deferred returned by this method.
 
         log.msg("%s.startBuild" % self)
-        self.setupStatus(build_status)
+        self.build_status = build_status
         # now that we have a build_status, we can set properties
+        self.setupProperties()
         self.setupSlaveBuilder(slavebuilder)
 
         # convert all locks into their real forms

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/builder.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- builder.py	23 Mar 2008 03:14:47 -0000	1.53
+++ builder.py	22 May 2008 22:13:06 -0000	1.54
@@ -253,6 +253,8 @@
     @type building: list of L{buildbot.process.base.Build}
     @ivar building: Builds that are actively running
 
+    @type slaves: list of L{buildbot.buildslave.BuildSlave} objects
+    @ivar slaves: the slaves currently available for building
     """
 
     expectations = None # this is created the first time we get a good build
@@ -445,7 +447,7 @@
         """This is invoked by the BuildSlave when the self.slavename bot
         registers their builder.
 
-        @type  slave: L{buildbot.master.BuildSlave}
+        @type  slave: L{buildbot.buildslave.BuildSlave}
         @param slave: the BuildSlave that represents the buildslave as a whole
         @type  remote: L{twisted.spread.pb.RemoteReference}
         @param remote: a reference to the L{buildbot.slave.bot.SlaveBuilder}

Index: properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/properties.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- properties.py	22 May 2008 22:13:02 -0000	1.2
+++ properties.py	22 May 2008 22:13:06 -0000	1.3
@@ -18,8 +18,13 @@
     As a special case, a property value of None is returned as an empty 
     string when used as a mapping.
     """
-    def __init__(self):
+    def __init__(self, props={}, props_source=''):
+        """
+        @param props: dictionary giving initial property values (for testing)
+        @param props_source: source to use for props
+        """
         self.properties = {}
+        if props: self.update(props, props_source)
 
     def __getitem__(self, name):
         """Just get the value for this property, special-casing None -> ''"""
@@ -37,6 +42,9 @@
     def getPropertySource(self, name):
         return self.properties[name][1]
 
+    def __repr__(self):
+        return repr(dict([ (k,v[0]) for k,v in self.properties.iteritems() ]))
+
     def setProperty(self, name, value, source):
         self.properties[name] = (value, source)
 




From warner at users.sourceforge.net  Thu May 22 22:13:09 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:09 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test runutils.py, 1.26,
	1.27 test_properties.py, 1.15, 1.16
Message-ID: <E1JzJ25-0005Ls-EN@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17543/buildbot/test

Modified Files:
	runutils.py test_properties.py 
Log Message:
[project @ #124:scheduler-properties.patch]
Arrange for properties to come down from schedulers, via BuildStep and
BuildRequest objects.  custom_props are still present, in parallel, but
will go eventually. Triggered builds no longer propagate custom props.

Original author: dustin at v.igoro.us
Date: 2008-04-12 23:46:58+00:00

Index: runutils.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/runutils.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- runutils.py	22 Mar 2008 22:14:16 -0000	1.26
+++ runutils.py	22 May 2008 22:13:06 -0000	1.27
@@ -152,7 +152,7 @@
         if bs.getResults() != builder.SUCCESS:
             log.msg("failUnlessBuildSucceeded noticed that the build failed")
             self.logBuildResults(bs)
-        self.failUnless(bs.getResults() == builder.SUCCESS)
+        self.failUnlessEqual(bs.getResults(), builder.SUCCESS)
         return bs # useful for chaining
 
     def logBuildResults(self, bs):
@@ -288,7 +288,8 @@
     s = step_class(**kwargs)
     s.setBuild(b)
     s.setStepStatus(bss)
-    b.setupStatus(bss.getBuild())
+    b.build_status = bss.getBuild()
+    b.setupProperties()
     s.slaveVersion = fake_slaveVersion
     return s
 

Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- test_properties.py	22 May 2008 22:13:02 -0000	1.15
+++ test_properties.py	22 May 2008 22:13:06 -0000	1.16
@@ -20,12 +20,15 @@
     name = "fakebuilder"
 class FakeSlave:
     slavename = "bot12"
+    properties = Properties()
+    properties.setProperty("slavename", slavename, "BuildSlave")
 class FakeSlaveBuilder:
     slave = FakeSlave()
     def getSlaveCommandVersion(self, command, oldversion=None):
         return "1.10"
 class FakeScheduler:
     name = "fakescheduler"
+    properties = Properties({'name' : name}, 'Scheduler')
 
 class TestProperties(unittest.TestCase):
     def setUp(self):
@@ -130,43 +133,23 @@
         rmdirRecursive(self.builder_status.basedir)
         os.mkdir(self.builder_status.basedir)
         self.build_status = self.builder_status.newBuild()
-        req = base.BuildRequest("reason", SourceStamp(branch="branch2",
-                                                      revision="1234"))
+        req = base.BuildRequest("reason", 
+                    SourceStamp(branch="branch2", revision="1234"),
+                    properties=Properties({"scheduler" : "fakescheduler"}, "Scheduler"))
         self.build = base.Build([req])
+        self.build.build_status = self.build_status
         self.build.setBuilder(self.builder)
-        self.build.setupStatus(self.build_status)
+        self.build.setupProperties()
         self.build.setupSlaveBuilder(FakeSlaveBuilder())
 
     def testProperties(self):
-        # if not started from a scheduler, the 'scheduler' property
-        # should be 'none'
-        self.failUnlessEqual(self.build.getProperty("scheduler"), "none")
+        self.failUnlessEqual(self.build.getProperty("scheduler"), "fakescheduler")
         self.failUnlessEqual(self.build.getProperty("branch"), "branch2")
         self.failUnlessEqual(self.build.getProperty("revision"), "1234")
         self.failUnlessEqual(self.build.getProperty("slavename"), "bot12")
         self.failUnlessEqual(self.build.getProperty("buildnumber"), 5)
         self.failUnlessEqual(self.build.getProperty("buildername"), "fakebuilder")
 
-class SchedulerTest(unittest.TestCase):
-    def setUp(self):
-        self.builder = FakeBuilder()
-        self.builder_status = builder.BuilderStatus("fakebuilder")
-        self.builder_status.basedir = "test_properties"
-        self.builder_status.nextBuildNumber = 5
-        rmdirRecursive(self.builder_status.basedir)
-        os.mkdir(self.builder_status.basedir)
-        self.build_status = self.builder_status.newBuild()
-        req = base.BuildRequest("reason", SourceStamp(branch="branch2",
-                                revision=1234), scheduler=FakeScheduler())
-        self.build = base.Build([req])
-        self.build.setBuilder(self.builder)
-        self.build.setupStatus(self.build_status)
-        self.build.setupSlaveBuilder(FakeSlaveBuilder())
-
-    def testWithScheduler(self):
-        self.failUnlessEqual(self.build.getProperty("scheduler"),
-                             "fakescheduler")
-
 run_config = """
 from buildbot.process import factory
 from buildbot.steps.shell import ShellCommand, WithProperties
@@ -174,7 +157,7 @@
 s = factory.s
 
 BuildmasterConfig = c = {}
-c['slaves'] = [BuildSlave('bot1', 'sekrit')]
+c['slaves'] = [BuildSlave('bot1', 'sekrit', properties={'slprop':'slprop'})]
 c['schedulers'] = []
 c['slavePortnum'] = 0
 
@@ -187,7 +170,8 @@
 f1 = factory.BuildFactory([s(ShellCommand,
                              flunkOnFailure=True,
                              command=['touch',
-                                      WithProperties('%s-slave', 'slavename'),
+                                      WithProperties('%s-slave-%s',
+                                        'slavename', 'slprop'),
                                       ],
                              workdir='.',
                              timeout=10,
@@ -207,7 +191,7 @@
         d.addCallback(lambda res: self.requestBuild("full1"))
         d.addCallback(self.failUnlessBuildSucceeded)
         def _check_touch(res):
-            f = os.path.join("slavebase-bot1", "bd1", "bot1-slave")
+            f = os.path.join("slavebase-bot1", "bd1", "bot1-slave-slprop")
             self.failUnless(os.path.exists(f))
             return res
         d.addCallback(_check_touch)




From warner at users.sourceforge.net  Thu May 22 22:13:13 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:13 +0000
Subject: [Buildbot-commits] buildbot/buildbot master.py,1.114,1.115
Message-ID: <E1JzJ2B-0005Na-S9@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17640/buildbot

Modified Files:
	master.py 
Log Message:
[project @ #124:global-properties.patch]
Support global properties, defined with c['properties'] = {} in master.cfg

Original author: dustin at v.igoro.us
Date: 2008-04-13 00:32:42+00:00

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- master.py	22 May 2008 22:12:52 -0000	1.114
+++ master.py	22 May 2008 22:13:10 -0000	1.115
@@ -27,6 +27,7 @@
 from buildbot.sourcestamp import SourceStamp
 from buildbot.buildslave import BuildSlave
 from buildbot import interfaces
+from buildbot.process.properties import Properties
 
 ########################################
 
@@ -231,9 +232,6 @@
         assert isinstance(custom_props, dict), \
                "custom_props must be a dict (not %r)" % (custom_props,)
 
-        # Provide default values for any custom build properties the
-        # client did not send.
-
         c = interfaces.IControl(self.master)
         bc = c.getBuilder(buildername)
         ss = SourceStamp(branch, revision)
@@ -345,6 +343,7 @@
     projectURL = None
     buildbotURL = None
     change_svc = None
+    properties = Properties()
 
     def __init__(self, basedir, configFileName="master.cfg"):
         service.MultiService.__init__(self)
@@ -500,6 +499,7 @@
                       "schedulers", "builders",
                       "slavePortnum", "debugPassword", "manhole",
                       "status", "projectName", "projectURL", "buildbotURL",
+                      "properties"
                       )
         for k in config.keys():
             if k not in known_keys:
@@ -527,6 +527,7 @@
             projectName = config.get('projectName')
             projectURL = config.get('projectURL')
             buildbotURL = config.get('buildbotURL')
+            properties = config.get('properties', {})
 
         except KeyError, e:
             log.msg("config dictionary is missing a required parameter")
@@ -658,6 +659,9 @@
                     else:
                         locks[l.name] = l
 
+        if not isinstance(properties, dict):
+            raise ValueError("c['properties'] must be a dictionary")
+
         # slavePortnum supposed to be a strports specification
         if type(slavePortnum) is int:
             slavePortnum = "tcp:%d" % slavePortnum
@@ -672,6 +676,9 @@
         self.projectName = projectName
         self.projectURL = projectURL
         self.buildbotURL = buildbotURL
+        
+        self.properties = Properties()
+        self.properties.update(properties, self.configFileName)
 
         # self.slaves: Disconnect any that were attached and removed from the
         # list. Update self.checker with the new list of passwords, including




From warner at users.sourceforge.net  Thu May 22 22:13:13 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:13 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test runutils.py, 1.27,
	1.28 test_properties.py, 1.16, 1.17
Message-ID: <E1JzJ2B-0005Nh-W9@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17640/buildbot/test

Modified Files:
	runutils.py test_properties.py 
Log Message:
[project @ #124:global-properties.patch]
Support global properties, defined with c['properties'] = {} in master.cfg

Original author: dustin at v.igoro.us
Date: 2008-04-13 00:32:42+00:00

Index: runutils.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/runutils.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- runutils.py	22 May 2008 22:13:06 -0000	1.27
+++ runutils.py	22 May 2008 22:13:11 -0000	1.28
@@ -13,6 +13,7 @@
 from buildbot.process.buildstep import BuildStep
 from buildbot.sourcestamp import SourceStamp
 from buildbot.status import builder
+from buildbot.process.properties import Properties
 
 
 
@@ -275,6 +276,12 @@
     from buildbot.slave.registry import commandRegistry
     return commandRegistry[command]
 
+class FakeBuildMaster:
+    properties = Properties(masterprop="master")
+
+class FakeBotMaster:
+    parent = FakeBuildMaster()
+
 def makeBuildStep(basedir, step_class=BuildStep, **kwargs):
     bss = setupBuildStepStatus(basedir)
 
@@ -282,6 +289,7 @@
     setup = {'name': "builder1", "slavename": "bot1",
              'builddir': "builddir", 'factory': None}
     b0 = Builder(setup, bss.getBuild().getBuilder())
+    b0.botmaster = FakeBotMaster()
     br = BuildRequest("reason", ss)
     b = Build([br])
     b.setBuilder(b0)

Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- test_properties.py	22 May 2008 22:13:06 -0000	1.16
+++ test_properties.py	22 May 2008 22:13:11 -0000	1.17
@@ -15,9 +15,14 @@
 
 class FakeBuild:
     pass
+class FakeBuildMaster:
+    properties = Properties(masterprop="master")
+class FakeBotMaster:
+    parent = FakeBuildMaster()
 class FakeBuilder:
     statusbag = None
     name = "fakebuilder"
+    botmaster = FakeBotMaster()
 class FakeSlave:
     slavename = "bot12"
     properties = Properties()
@@ -28,7 +33,7 @@
         return "1.10"
 class FakeScheduler:
     name = "fakescheduler"
-    properties = Properties({'name' : name}, 'Scheduler')
+    properties = Properties(name=name)
 
 class TestProperties(unittest.TestCase):
     def setUp(self):
@@ -135,7 +140,7 @@
         self.build_status = self.builder_status.newBuild()
         req = base.BuildRequest("reason", 
                     SourceStamp(branch="branch2", revision="1234"),
-                    properties=Properties({"scheduler" : "fakescheduler"}, "Scheduler"))
+                    properties=Properties(scheduler="fakescheduler"))
         self.build = base.Build([req])
         self.build.build_status = self.build_status
         self.build.setBuilder(self.builder)
@@ -149,6 +154,7 @@
         self.failUnlessEqual(self.build.getProperty("slavename"), "bot12")
         self.failUnlessEqual(self.build.getProperty("buildnumber"), 5)
         self.failUnlessEqual(self.build.getProperty("buildername"), "fakebuilder")
+        self.failUnlessEqual(self.build.getProperty("masterprop"), "master")
 
 run_config = """
 from buildbot.process import factory
@@ -160,6 +166,7 @@
 c['slaves'] = [BuildSlave('bot1', 'sekrit', properties={'slprop':'slprop'})]
 c['schedulers'] = []
 c['slavePortnum'] = 0
+c['properties'] = { 'global' : 'global' }
 
 # Note: when run against twisted-1.3.0, this locks up about 5% of the time. I
 # suspect that a command with no output that finishes quickly triggers a race
@@ -170,8 +177,8 @@
 f1 = factory.BuildFactory([s(ShellCommand,
                              flunkOnFailure=True,
                              command=['touch',
-                                      WithProperties('%s-slave-%s',
-                                        'slavename', 'slprop'),
+                                      WithProperties('%s-%s-%s',
+                                        'slavename', 'global', 'slprop'),
                                       ],
                              workdir='.',
                              timeout=10,
@@ -191,7 +198,7 @@
         d.addCallback(lambda res: self.requestBuild("full1"))
         d.addCallback(self.failUnlessBuildSucceeded)
         def _check_touch(res):
-            f = os.path.join("slavebase-bot1", "bd1", "bot1-slave-slprop")
+            f = os.path.join("slavebase-bot1", "bd1", "bot1-global-slprop")
             self.failUnless(os.path.exists(f))
             return res
         d.addCallback(_check_touch)




From warner at users.sourceforge.net  Thu May 22 22:13:13 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:13 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process base.py, 1.82,
	1.83 properties.py, 1.3, 1.4
Message-ID: <E1JzJ2B-0005Nf-Vy@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17640/buildbot/process

Modified Files:
	base.py properties.py 
Log Message:
[project @ #124:global-properties.patch]
Support global properties, defined with c['properties'] = {} in master.cfg

Original author: dustin at v.igoro.us
Date: 2008-04-13 00:32:42+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- base.py	22 May 2008 22:13:06 -0000	1.82
+++ base.py	22 May 2008 22:13:11 -0000	1.83
@@ -273,7 +273,9 @@
     def setupProperties(self):
         props = self.getProperties()
 
-        #props.updateFromProperties(self.global_properties) TODO
+        # start with global properties from the configuration
+        buildmaster = self.builder.botmaster.parent
+        props.updateFromProperties(buildmaster.properties)
 
         # get any properties from requests (this is the path through
         # which schedulers will send us properties)

Index: properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/properties.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- properties.py	22 May 2008 22:13:06 -0000	1.3
+++ properties.py	22 May 2008 22:13:11 -0000	1.4
@@ -18,13 +18,12 @@
     As a special case, a property value of None is returned as an empty 
     string when used as a mapping.
     """
-    def __init__(self, props={}, props_source=''):
+    def __init__(self, **kwargs):
         """
-        @param props: dictionary giving initial property values (for testing)
-        @param props_source: source to use for props
+        @param kwargs: initial property values (for testing)
         """
         self.properties = {}
-        if props: self.update(props, props_source)
+        if kwargs: self.update(kwargs, "TEST")
 
     def __getitem__(self, name):
         """Just get the value for this property, special-casing None -> ''"""




From warner at users.sourceforge.net  Thu May 22 22:13:19 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:19 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test runutils.py, 1.28,
	1.29 test_properties.py, 1.17, 1.18 test_run.py, 1.55, 1.56
Message-ID: <E1JzJ2G-0005Pv-Cx@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17668/buildbot/test

Modified Files:
	runutils.py test_properties.py test_run.py 
Log Message:
[project @ #124:schedulers-provide-properties.patch]
Make the scheduler classes actually provide properties to the buildsets
they submit.  Triggerable schedulers also do a nice job of configurably
propagating properties from the triggering build.

Original author: dustin at v.igoro.us
Date: 2008-04-13 18:42:31+00:00

Index: runutils.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/runutils.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- runutils.py	22 May 2008 22:13:11 -0000	1.28
+++ runutils.py	22 May 2008 22:13:17 -0000	1.29
@@ -489,7 +489,8 @@
         self.value = value
 
     def start(self):
-        _flags[self.flagname] = self.value
+        properties = self.build.getProperties()
+        _flags[self.flagname] = properties.render(self.value)
         self.finished(builder.SUCCESS)
 
 class TestFlagMixin:

Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- test_properties.py	22 May 2008 22:13:11 -0000	1.17
+++ test_properties.py	22 May 2008 22:13:17 -0000	1.18
@@ -25,15 +25,13 @@
     botmaster = FakeBotMaster()
 class FakeSlave:
     slavename = "bot12"
-    properties = Properties()
-    properties.setProperty("slavename", slavename, "BuildSlave")
+    properties = Properties(slavename="bot12")
 class FakeSlaveBuilder:
     slave = FakeSlave()
     def getSlaveCommandVersion(self, command, oldversion=None):
         return "1.10"
 class FakeScheduler:
     name = "fakescheduler"
-    properties = Properties(name=name)
 
 class TestProperties(unittest.TestCase):
     def setUp(self):

Index: test_run.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_run.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- test_run.py	22 Mar 2008 22:14:21 -0000	1.55
+++ test_run.py	22 May 2008 22:13:17 -0000	1.56
@@ -699,6 +699,108 @@
         self.failIfFlagSet('triggeree_finished')
         self.failIfFlagSet('triggerer_finished')
 
+class PropertyPropagation(RunMixin, TestFlagMixin, unittest.TestCase):
+    def setupTest(self, config, builders, checkFn):
+        self.clearFlags()
+        m = self.master
+        m.loadConfig(config)
+        m.readConfig = True
+        m.startService()
+
+        c = changes.Change("bob", ["Makefile", "foo/bar.c"], "changed stuff")
+        m.change_svc.addChange(c)
+
+        d = self.connectSlave(builders=builders)
+        d.addCallback(self.startTimer, 0.5, checkFn)
+        return d
+
+    def startTimer(self, res, time, next_fn):
+        d = defer.Deferred()
+        reactor.callLater(time, d.callback, None)
+        d.addCallback(next_fn)
+        return d
+
+    config_schprop = config_base + """
+from buildbot.scheduler import Scheduler
+from buildbot.steps.dummy import Dummy
+from buildbot.test.runutils import SetTestFlagStep
+from buildbot.process.properties import WithProperties
+c['schedulers'] = [
+    Scheduler('mysched', None, 0.1, ['flagcolor'], properties={'color':'red'}),
+]
+factory = factory.BuildFactory([
+    s(SetTestFlagStep, flagname='testresult', 
+      value=WithProperties('color=%(color)s sched=%(scheduler)s')),
+    ])
+c['builders'] = [{'name': 'flagcolor', 'slavename': 'bot1',
+                  'builddir': 'test', 'factory': factory},
+                ]
+"""
+
+    def testScheduler(self):
+        def _check(res):
+            self.failUnlessEqual(self.getFlag('testresult'),
+                'color=red sched=mysched')
+        return self.setupTest(self.config_schprop, ['flagcolor'], _check)
+
+    config_slaveprop = config_base + """
+from buildbot.scheduler import Scheduler
+from buildbot.steps.dummy import Dummy
+from buildbot.test.runutils import SetTestFlagStep
+from buildbot.process.properties import WithProperties
+c['schedulers'] = [
+    Scheduler('mysched', None, 0.1, ['flagcolor'])
+]
+c['slaves'] = [BuildSlave('bot1', 'sekrit', properties={'color':'orange'})]
+factory = factory.BuildFactory([
+    s(SetTestFlagStep, flagname='testresult', 
+      value=WithProperties('color=%(color)s slavename=%(slavename)s')),
+    ])
+c['builders'] = [{'name': 'flagcolor', 'slavename': 'bot1',
+                  'builddir': 'test', 'factory': factory},
+                ]
+"""
+    def testSlave(self):
+        def _check(res):
+            self.failUnlessEqual(self.getFlag('testresult'),
+                'color=orange slavename=bot1')
+        return self.setupTest(self.config_slaveprop, ['flagcolor'], _check)
+
+    config_trigger = config_base + """
+from buildbot.scheduler import Triggerable, Scheduler
+from buildbot.steps.trigger import Trigger
+from buildbot.steps.dummy import Dummy
+from buildbot.test.runutils import SetTestFlagStep
+from buildbot.process.properties import WithProperties
+c['schedulers'] = [
+    Scheduler('triggerer', None, 0.1, ['triggerer'], 
+        properties={'color':'mauve', 'pls_trigger':'triggeree'}),
+    Triggerable('triggeree', ['triggeree'], properties={'color':'invisible'})
+]
+triggerer = factory.BuildFactory([
+    s(SetTestFlagStep, flagname='testresult', value='wrongone'),
+    s(Trigger, flunkOnFailure=True, 
+        schedulerNames=[WithProperties('%(pls_trigger)s')],
+        set_properties={'color' : WithProperties('%(color)s')}),
+    s(SetTestFlagStep, flagname='testresult', value='triggered'),
+    ])
+triggeree = factory.BuildFactory([
+    s(SetTestFlagStep, flagname='testresult', 
+        value=WithProperties('sched=%(scheduler)s color=%(color)s')),
+    ])
+c['builders'] = [{'name': 'triggerer', 'slavename': 'bot1',
+                  'builddir': 'triggerer', 'factory': triggerer},
+                 {'name': 'triggeree', 'slavename': 'bot1',
+                  'builddir': 'triggeree', 'factory': triggeree}]
+"""
+    def testTrigger(self):
+        def _check(res):
+            self.failUnlessEqual(self.getFlag('testresult'),
+                'sched=triggeree color=mauve')
+        return self.setupTest(self.config_trigger, 
+                ['triggerer', 'triggeree'], _check)
+
+
 config_test_flag = config_base + """
 from buildbot.scheduler import Scheduler
 c['schedulers'] = [Scheduler('quick', None, 0.1, ['dummy'])]




From warner at users.sourceforge.net  Thu May 22 22:13:19 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:19 +0000
Subject: [Buildbot-commits] buildbot/buildbot buildset.py, 1.9,
	1.10 interfaces.py, 1.65, 1.66 scheduler.py, 1.31, 1.32
Message-ID: <E1JzJ2G-0003Je-Ci@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17668/buildbot

Modified Files:
	buildset.py interfaces.py scheduler.py 
Log Message:
[project @ #124:schedulers-provide-properties.patch]
Make the scheduler classes actually provide properties to the buildsets
they submit.  Triggerable schedulers also do a nice job of configurably
propagating properties from the triggering build.

Original author: dustin at v.igoro.us
Date: 2008-04-13 18:42:31+00:00

Index: buildset.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/buildset.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- buildset.py	22 May 2008 22:13:06 -0000	1.9
+++ buildset.py	22 May 2008 22:13:17 -0000	1.10
@@ -1,6 +1,6 @@
-
 from buildbot.process import base
 from buildbot.status import builder
+from buildbot.process.properties import Properties
 
 
 class BuildSet:
@@ -20,7 +20,9 @@
         self.reason = reason
 
         self.custom_props = custom_props
-        self.properties = properties
+
+        self.properties = Properties()
+        if properties: self.properties.updateFromProperties(properties)
 
         self.stillHopeful = True
         self.status = bss = builder.BuildSetStatus(source, reason,

Index: interfaces.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/interfaces.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- interfaces.py	18 Mar 2008 22:25:55 -0000	1.65
+++ interfaces.py	22 May 2008 22:13:17 -0000	1.66
@@ -38,7 +38,12 @@
 class IScheduler(Interface):
     """I watch for Changes in the source tree and decide when to trigger
     Builds. I create BuildSet objects and submit them to the BuildMaster. I
-    am a service, and the BuildMaster is always my parent."""
+    am a service, and the BuildMaster is always my parent.
+    
+    @ivar properties: properties to be applied to all builds started by this
+    scheduler
+    @type properties: L<buildbot.process.properties.Properties>
+    """
 
     def addChange(change):
         """A Change has just been dispatched by one of the ChangeSources.

Index: scheduler.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scheduler.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- scheduler.py	22 May 2008 22:13:06 -0000	1.31
+++ scheduler.py	22 May 2008 22:13:17 -0000	1.32
@@ -46,7 +46,7 @@
         # TODO: why can't id() return a positive number? %d is ugly.
         return "<Scheduler '%s' at %d>" % (self.name, id(self))
 
-    def submit(self, bs):
+    def submitBuildSet(self, bs):
         self.parent.submitBuildSet(bs)
 
     def addChange(self, change):
@@ -55,8 +55,8 @@
 class BaseUpstreamScheduler(BaseScheduler):
     implements(interfaces.IUpstreamScheduler)
 
-    def __init__(self, name):
-        BaseScheduler.__init__(self, name)
+    def __init__(self, name, properties={}):
+        BaseScheduler.__init__(self, name, properties)
         self.successWatchers = []
 
     def subscribeToSuccessfulBuilds(self, watcher):
@@ -64,10 +64,10 @@
     def unsubscribeToSuccessfulBuilds(self, watcher):
         self.successWatchers.remove(watcher)
 
-    def submit(self, bs):
+    def submitBuildSet(self, bs):
         d = bs.waitUntilFinished()
         d.addCallback(self.buildSetFinished)
-        self.parent.submitBuildSet(bs)
+        BaseScheduler.submitBuildSet(self, bs)
 
     def buildSetFinished(self, bss):
         if not self.running:
@@ -88,10 +88,10 @@
 
     fileIsImportant = None
     compare_attrs = ('name', 'treeStableTimer', 'builderNames', 'branch',
-                     'fileIsImportant')
+                     'fileIsImportant', 'properties')
     
     def __init__(self, name, branch, treeStableTimer, builderNames,
-                 fileIsImportant=None):
+                 fileIsImportant=None, properties={}):
         """
         @param name: the name of this Scheduler
         @param branch: The branch name that the Scheduler should pay
@@ -113,9 +113,12 @@
                                 build is triggered by an important change.
                                 The default value of None means that all
                                 Changes are important.
+
+        @param properties: properties to apply to all builds started from this 
+                           scheduler
         """
 
-        BaseUpstreamScheduler.__init__(self, name)
+        BaseUpstreamScheduler.__init__(self, name, properties)
         self.treeStableTimer = treeStableTimer
         errmsg = ("The builderNames= argument to Scheduler must be a list "
                   "of Builder description names (i.e. the 'name' key of the "
@@ -189,8 +192,9 @@
 
         # create a BuildSet, submit it to the BuildMaster
         bs = buildset.BuildSet(self.builderNames,
-                               SourceStamp(changes=changes))
-        self.submit(bs)
+                               SourceStamp(changes=changes),
+                               properties=self.properties)
+        self.submitBuildSet(bs)
 
     def stopService(self):
         self.stopTimer()
@@ -206,10 +210,10 @@
     fileIsImportant = None
 
     compare_attrs = ('name', 'branches', 'treeStableTimer', 'builderNames',
-                     'fileIsImportant')
+                     'fileIsImportant', 'properties')
 
     def __init__(self, name, branches, treeStableTimer, builderNames,
-                 fileIsImportant=None):
+                 fileIsImportant=None, properties={}):
         """
         @param name: the name of this Scheduler
         @param branches: The branch names that the Scheduler should pay
@@ -234,9 +238,12 @@
                                 build is triggered by an important change.
                                 The default value of None means that all
                                 Changes are important.
+
+        @param properties: properties to apply to all builds started from this 
+                           scheduler
         """
 
-        BaseUpstreamScheduler.__init__(self, name)
+        BaseUpstreamScheduler.__init__(self, name, properties)
         self.treeStableTimer = treeStableTimer
         for b in builderNames:
             assert isinstance(b, str)
@@ -290,19 +297,16 @@
             self.schedulers[branch] = s
         s.addChange(change)
 
-    def submitBuildSet(self, bs):
-        self.parent.submitBuildSet(bs)
-
 
 class Dependent(BaseUpstreamScheduler):
     """This scheduler runs some set of 'downstream' builds when the
     'upstream' scheduler has completed successfully."""
 
-    compare_attrs = ('name', 'upstream', 'builders')
+    compare_attrs = ('name', 'upstream', 'builders', 'properties')
 
-    def __init__(self, name, upstream, builderNames):
+    def __init__(self, name, upstream, builderNames, properties={}):
         assert interfaces.IUpstreamScheduler.providedBy(upstream)
-        BaseUpstreamScheduler.__init__(self, name)
+        BaseUpstreamScheduler.__init__(self, name, properties)
         self.upstream = upstream
         self.builderNames = builderNames
 
@@ -323,8 +327,9 @@
         return d
 
     def upstreamBuilt(self, ss):
-        bs = buildset.BuildSet(self.builderNames, ss)
-        self.submit(bs)
+        bs = buildset.BuildSet(self.builderNames, ss,
+                    properties=self.properties)
+        self.submitBuildSet(bs)
 
 
 
@@ -337,11 +342,11 @@
     # TODO: consider having this watch another (changed-based) scheduler and
     # merely enforce a minimum time between builds.
 
-    compare_attrs = ('name', 'builderNames', 'periodicBuildTimer', 'branch')
+    compare_attrs = ('name', 'builderNames', 'periodicBuildTimer', 'branch', 'properties')
 
     def __init__(self, name, builderNames, periodicBuildTimer,
-                 branch=None):
-        BaseUpstreamScheduler.__init__(self, name)
+                 branch=None, properties={}):
+        BaseUpstreamScheduler.__init__(self, name, properties)
         self.builderNames = builderNames
         self.periodicBuildTimer = periodicBuildTimer
         self.branch = branch
@@ -362,8 +367,9 @@
     def doPeriodicBuild(self):
         bs = buildset.BuildSet(self.builderNames,
                                SourceStamp(branch=self.branch),
-                               self.reason)
-        self.submit(bs)
+                               self.reason,
+                               properties=self.properties)
+        self.submitBuildSet(bs)
 
 
 
@@ -407,15 +413,15 @@
 
     compare_attrs = ('name', 'builderNames',
                      'minute', 'hour', 'dayOfMonth', 'month',
-                     'dayOfWeek', 'branch')
+                     'dayOfWeek', 'branch', 'properties')
 
     def __init__(self, name, builderNames, minute=0, hour='*',
                  dayOfMonth='*', month='*', dayOfWeek='*',
-                 branch=None):
+                 branch=None, properties={}):
         # Setting minute=0 really makes this an 'Hourly' scheduler. This
         # seemed like a better default than minute='*', which would result in
         # a build every 60 seconds.
-        BaseUpstreamScheduler.__init__(self, name)
+        BaseUpstreamScheduler.__init__(self, name, properties)
         self.builderNames = builderNames
         self.minute = minute
         self.hour = hour
@@ -520,20 +526,18 @@
         # And trigger a build
         bs = buildset.BuildSet(self.builderNames,
                                SourceStamp(branch=self.branch),
-                               self.reason)
-        self.submit(bs)
+                               self.reason,
+                               properties=self.properties)
+        self.submitBuildSet(bs)
 
     def addChange(self, change):
         pass
 
 
 
-class TryBase(service.MultiService, util.ComparableMixin):
-    implements(interfaces.IScheduler)
-
-    def __init__(self, name, builderNames):
-        service.MultiService.__init__(self)
-        self.name = name
+class TryBase(BaseScheduler):
+    def __init__(self, name, builderNames, properties={}):
+        BaseScheduler.__init__(self, name, properties)
         self.builderNames = builderNames
 
     def listBuilderNames(self):
@@ -564,10 +568,10 @@
         self.error = True
 
 class Try_Jobdir(TryBase):
-    compare_attrs = ["name", "builderNames", "jobdir"]
+    compare_attrs = ( 'name', 'builderNames', 'jobdir', 'properties' )
 
-    def __init__(self, name, builderNames, jobdir):
-        TryBase.__init__(self, name, builderNames)
+    def __init__(self, name, builderNames, jobdir, properties={}):
+        TryBase.__init__(self, name, builderNames, properties)
         self.jobdir = jobdir
         self.watcher = MaildirService()
         self.watcher.setServiceParent(self)
@@ -642,15 +646,16 @@
                 return
 
         reason = "'try' job"
-        bs = buildset.BuildSet(builderNames, ss, reason=reason, bsid=bsid)
-        self.parent.submitBuildSet(bs)
+        bs = buildset.BuildSet(builderNames, ss, reason=reason, 
+                    bsid=bsid, properties=self.properties)
+        self.submitBuildSet(bs)
 
 class Try_Userpass(TryBase):
-    compare_attrs = ["name", "builderNames", "port", "userpass"]
+    compare_attrs = ( 'name', 'builderNames', 'port', 'userpass', 'properties' )
     implements(portal.IRealm)
 
-    def __init__(self, name, builderNames, port, userpass):
-        TryBase.__init__(self, name, builderNames)
+    def __init__(self, name, builderNames, port, userpass, properties={}):
+        TryBase.__init__(self, name, builderNames, properties)
         if type(port) is int:
             port = "tcp:%d" % port
         self.port = port
@@ -675,9 +680,6 @@
         p = Try_Userpass_Perspective(self, avatarID)
         return (pb.IPerspective, p, lambda: None)
 
-    def submitBuildSet(self, bs):
-        return self.parent.submitBuildSet(bs)
-
 class Try_Userpass_Perspective(pbutil.NewCredPerspective):
     def __init__(self, parent, username):
         self.parent = parent
@@ -699,7 +701,8 @@
         bs = buildset.BuildSet(builderNames, 
                                ss,
                                reason=reason, 
-                               custom_props=custom_props)
+                               custom_props=custom_props,
+                               properties=self.parent.properties)
 
         self.parent.submitBuildSet(bs)
 
@@ -713,8 +716,10 @@
     the builds that I fire have finished.
     """
 
-    def __init__(self, name, builderNames):
-        BaseUpstreamScheduler.__init__(self, name)
+    compare_attrs = ('name', 'builderNames', 'properties')
+
+    def __init__(self, name, builderNames, properties={}):
+        BaseUpstreamScheduler.__init__(self, name, properties)
         self.builderNames = builderNames
 
     def listBuilderNames(self):
@@ -723,11 +728,18 @@
     def getPendingBuildTimes(self):
         return []
 
-    def trigger(self, ss, custom_props={}):
+    def trigger(self, ss, custom_props={}, set_props=None):
         """Trigger this scheduler. Returns a deferred that will fire when the
         buildset is finished.
         """
-        bs = buildset.BuildSet(self.builderNames, ss, custom_props=custom_props)
+
+        # properties for this buildset are composed of our own properties,
+        # potentially overridden by anything from the triggering build
+        props = Properties()
+        props.updateFromProperties(self.properties)
+        if set_props: props.updateFromProperties(set_props)
+
+        bs = buildset.BuildSet(self.builderNames, ss, custom_props=custom_props, properties=props)
         d = bs.waitUntilFinished()
-        self.submit(bs)
+        self.submitBuildSet(bs)
         return d




From warner at users.sourceforge.net  Thu May 22 22:13:19 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:19 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps trigger.py,1.5,1.6
Message-ID: <E1JzJ2G-0005Pl-Am@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17668/buildbot/steps

Modified Files:
	trigger.py 
Log Message:
[project @ #124:schedulers-provide-properties.patch]
Make the scheduler classes actually provide properties to the buildsets
they submit.  Triggerable schedulers also do a nice job of configurably
propagating properties from the triggering build.

Original author: dustin at v.igoro.us
Date: 2008-04-13 18:42:31+00:00

Index: trigger.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/trigger.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- trigger.py	22 May 2008 22:13:06 -0000	1.5
+++ trigger.py	22 May 2008 22:13:17 -0000	1.6
@@ -1,5 +1,5 @@
 from buildbot.process.buildstep import LoggingBuildStep, SUCCESS, FAILURE, EXCEPTION
-from buildbot.steps.shell import WithProperties
+from buildbot.process.properties import WithProperties, Properties
 from buildbot.scheduler import Triggerable
 from twisted.internet import defer
 
@@ -12,7 +12,7 @@
     flunkOnFailure = True
 
     def __init__(self, schedulerNames=[], updateSourceStamp=True,
-                 waitForFinish=False, **kwargs):
+                 waitForFinish=False, set_properties={}, **kwargs):
         """
         Trigger the given schedulers when this step is executed.
 
@@ -33,11 +33,19 @@
                               schedulers. If True, I will wait until all of
                               the triggered schedulers have finished their
                               builds.
+
+        @param set_properties: A dictionary of properties to set for any
+                               builds resulting from this trigger.  To copy
+                               existing properties, use WithProperties.  These
+                               properties will override properties set in the
+                               Triggered scheduler's constructor.
+
         """
         assert schedulerNames, "You must specify a scheduler to trigger"
         self.schedulerNames = schedulerNames
         self.updateSourceStamp = updateSourceStamp
         self.waitForFinish = waitForFinish
+        self.set_properties = set_properties
         self.running = False
         LoggingBuildStep.__init__(self, **kwargs)
         self.addFactoryArguments(schedulerNames=schedulerNames,
@@ -51,17 +59,20 @@
             self.step_status.setText(["interrupted"])
 
     def start(self):
-        custom_props = {}
+        properties = self.build.getProperties()
+
+        # make a new properties object from a dict rendered by the old 
+        # properties object
+        props_to_set = Properties()
+        props_to_set.update(properties.render(self.set_properties), "Trigger")
+
         self.running = True
         ss = self.build.getSourceStamp()
         if self.updateSourceStamp:
-            got = None
-            try:
-                got = self.build.getProperty('got_revision')
-            except KeyError:
-                pass
+            got = properties.getProperty('got_revision')
             if got:
                 ss = ss.getAbsoluteSourceStamp(got)
+
         # (is there an easier way to find the BuildMaster?)
         all_schedulers = self.build.builder.botmaster.parent.allSchedulers()
         all_schedulers = dict([(sch.name, sch) for sch in all_schedulers])
@@ -71,12 +82,11 @@
         # TODO: don't fire any schedulers if we discover an unknown one
         dl = []
         for scheduler in self.schedulerNames:
-            if isinstance(scheduler, WithProperties):
-                scheduler = scheduler.render(self.build)
+            scheduler = properties.render(scheduler)
             if all_schedulers.has_key(scheduler):
                 sch = all_schedulers[scheduler]
                 if isinstance(sch, Triggerable):
-                    dl.append(sch.trigger(ss, {})) # TODO: copy some properties, set the rest
+                    dl.append(sch.trigger(ss, set_props=props_to_set))
                     triggered_schedulers.append(scheduler)
                 else:
                     unknown_schedulers.append(scheduler)
@@ -100,10 +110,8 @@
         else:
             d = defer.succeed([])
 
-        # TODO: review this shadowed 'rc' value: can the callback modify the
-        # one that was defined above?
         def cb(rclist):
-            rc = SUCCESS
+            rc = SUCCESS # (this rc is not the same variable as that above)
             for was_cb, buildsetstatus in rclist:
                 # TODO: make this algo more configurable
                 if not was_cb:




From warner at users.sourceforge.net  Thu May 22 22:13:19 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:19 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process properties.py, 1.4, 1.5
Message-ID: <E1JzJ2G-0005Pn-BP@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17668/buildbot/process

Modified Files:
	properties.py 
Log Message:
[project @ #124:schedulers-provide-properties.patch]
Make the scheduler classes actually provide properties to the buildsets
they submit.  Triggerable schedulers also do a nice job of configurably
propagating properties from the triggering build.

Original author: dustin at v.igoro.us
Date: 2008-04-13 18:42:31+00:00

Index: properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/properties.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- properties.py	22 May 2008 22:13:11 -0000	1.4
+++ properties.py	22 May 2008 22:13:17 -0000	1.5
@@ -3,7 +3,7 @@
 from twisted.python import log
 from twisted.python.failure import Failure
 
-class Properties:
+class Properties(util.ComparableMixin):
     """
     I represent a set of properties that can be interpolated into various
     strings in buildsteps.
@@ -18,6 +18,9 @@
     As a special case, a property value of None is returned as an empty 
     string when used as a mapping.
     """
+
+    compare_attrs = ('properties')
+
     def __init__(self, **kwargs):
         """
         @param kwargs: initial property values (for testing)
@@ -36,7 +39,7 @@
 
     def getProperty(self, name, default=None):
         """Get the value for the given property, with no None -> '' special case"""
-        return self.properties.get(name, default)[0]
+        return self.properties.get(name, (default,))[0]
 
     def getPropertySource(self, name):
         return self.properties[name][1]




From warner at users.sourceforge.net  Thu May 22 22:13:24 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:24 +0000
Subject: [Buildbot-commits] buildbot/buildbot/clients debug.py,1.10,1.11
Message-ID: <E1JzJ2K-0003LD-Dk@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/clients
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17705/buildbot/clients

Modified Files:
	debug.py 
Log Message:
[project @ #124:remove-custom-props.patch]
Remove custom properties, which are now largely redundant, and on which the
properties interface was modeled.

Original author: dustin at v.igoro.us
Date: 2008-04-13 19:55:26+00:00

Index: debug.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/clients/debug.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- debug.py	22 May 2008 22:12:42 -0000	1.10
+++ debug.py	22 May 2008 22:13:21 -0000	1.11
@@ -104,9 +104,9 @@
             if revision == '':
                 revision = None
         reason = "debugclient 'Request Build' button pushed"
-        custom_props = {}
+        properties = {}
         d = self.remote.callRemote("requestBuild",
-                                   name, reason, branch, revision, custom_props)
+                                   name, reason, branch, revision, properties)
         d.addErrback(self.err)
 
     def do_ping(self, widget):




From warner at users.sourceforge.net  Thu May 22 22:13:24 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:24 +0000
Subject: [Buildbot-commits] buildbot/buildbot/scripts runner.py, 1.61,
	1.62 tryclient.py, 1.21, 1.22
Message-ID: <E1JzJ2K-0003Lg-Pu@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/scripts
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17705/buildbot/scripts

Modified Files:
	runner.py tryclient.py 
Log Message:
[project @ #124:remove-custom-props.patch]
Remove custom properties, which are now largely redundant, and on which the
properties interface was modeled.

Original author: dustin at v.igoro.us
Date: 2008-04-13 19:55:26+00:00

Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- runner.py	22 May 2008 22:12:05 -0000	1.61
+++ runner.py	22 May 2008 22:13:22 -0000	1.62
@@ -763,8 +763,8 @@
 
         ["builder", "b", None,
          "Run the trial build on this Builder. Can be used multiple times."],
-        ["customproperties", None, None,
-         "A set of custom properties made available in the build environment, format:prop=value,propb=valueb..."],
+        ["properties", None, None,
+         "A set of properties made available in the build environment, format:prop=value,propb=valueb..."],
         ]
 
     optFlags = [
@@ -774,21 +774,20 @@
     def __init__(self):
         super(TryOptions, self).__init__()
         self['builders'] = []
-        self['custom_props'] = {}
+        self['properties'] = {}
 
     def opt_builder(self, option):
         self['builders'].append(option)
 
-    def opt_customproperties(self, option):
-        # We need to split the value of this option into a dictionary of custom
-        # properties
-        custom_props = {}
+    def opt_properties(self, option):
+        # We need to split the value of this option into a dictionary of properties
+        properties = {}
         propertylist = option.split(",")
         for i in range(0,len(propertylist)):
             print propertylist[i]
             splitproperty = propertylist[i].split("=")
-            custom_props[splitproperty[0]] = splitproperty[1]
-        self['custom_props'] = custom_props
+            properties[splitproperty[0]] = splitproperty[1]
+        self['properties'] = properties
 
     def opt_patchlevel(self, option):
         self['patchlevel'] = int(option)

Index: tryclient.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/tryclient.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- tryclient.py	22 May 2008 22:12:05 -0000	1.21
+++ tryclient.py	22 May 2008 22:13:22 -0000	1.22
@@ -448,7 +448,7 @@
                               ss.revision,
                               ss.patch,
                               self.builderNames,
-                              self.config.get('custom_props', {}))
+                              self.config.get('properties', {}))
         d.addCallback(self._deliverJob_pb2)
         return d
     def _deliverJob_pb2(self, status):




From warner at users.sourceforge.net  Thu May 22 22:13:24 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:24 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process base.py,1.83,1.84
Message-ID: <E1JzJ2K-0003LO-Lw@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17705/buildbot/process

Modified Files:
	base.py 
Log Message:
[project @ #124:remove-custom-props.patch]
Remove custom properties, which are now largely redundant, and on which the
properties interface was modeled.

Original author: dustin at v.igoro.us
Date: 2008-04-13 19:55:26+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- base.py	22 May 2008 22:13:11 -0000	1.83
+++ base.py	22 May 2008 22:13:22 -0000	1.84
@@ -53,11 +53,10 @@
     source = None
     builder = None
     startCount = 0 # how many times we have tried to start this build
-    custom_props = {}
 
     implements(interfaces.IBuildRequestControl)
 
-    def __init__(self, reason, source, builderName=None, custom_props=None, properties=None):
+    def __init__(self, reason, source, builderName=None, properties=None):
         # TODO: remove the =None on builderName, it is there so I don't have
         # to change a lot of tests that create BuildRequest objects
         assert interfaces.ISourceStamp(source, None)
@@ -67,8 +66,6 @@
         self.properties = Properties()
         if properties:
             self.properties.updateFromProperties(properties)
-        if custom_props:
-            self.properties.update(custom_props, "BuildRequest-custom_props")
 
         self.start_watchers = []
         self.finish_watchers = []
@@ -96,9 +93,6 @@
         self.finish_watchers.append(d)
         return d
 
-    def customProps(self):
-     return self.custom_props
-
     # these are called by the Builder
 
     def requestSubmitted(self, builder):




From warner at users.sourceforge.net  Thu May 22 22:13:24 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:24 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web builder.py, 1.20,
	1.21
Message-ID: <E1JzJ2K-0003Li-Ql@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17705/buildbot/status/web

Modified Files:
	builder.py 
Log Message:
[project @ #124:remove-custom-props.patch]
Remove custom properties, which are now largely redundant, and on which the
properties interface was modeled.

Original author: dustin at v.igoro.us
Date: 2008-04-13 19:55:26+00:00

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/builder.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- builder.py	22 May 2008 22:12:14 -0000	1.20
+++ builder.py	22 May 2008 22:13:22 -0000	1.21
@@ -152,7 +152,7 @@
 
         return data
 
-    def force(self, req, custom_props={}):
+    def force(self, req):
         """
 
         Custom properties can be passed from the web form.  To do
@@ -161,8 +161,6 @@
         by inspecting req.args), then pass them to this superclass
         force method.
         
-        @param custom_props: Custom properties to set on build
-        
         """
         name = req.args.get("username", ["<unknown>"])[0]
         reason = req.args.get("comments", ["<no reason specified>"])[0]
@@ -196,7 +194,7 @@
         # button, use their name instead of None, so they'll be informed of
         # the results.
         s = SourceStamp(branch=branch, revision=revision)
-        req = BuildRequest(r, s, builderName=self.builder_status.getName(), custom_props=custom_props)
+        req = BuildRequest(r, s, builderName=self.builder_status.getName())
         try:
             self.builder_control.requestBuildSoon(req)
         except interfaces.NoSlaveError:




From warner at users.sourceforge.net  Thu May 22 22:13:23 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:23 +0000
Subject: [Buildbot-commits] buildbot/buildbot buildset.py, 1.10,
	1.11 master.py, 1.115, 1.116 scheduler.py, 1.32, 1.33
Message-ID: <E1JzJ2K-0005RF-E0@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17705/buildbot

Modified Files:
	buildset.py master.py scheduler.py 
Log Message:
[project @ #124:remove-custom-props.patch]
Remove custom properties, which are now largely redundant, and on which the
properties interface was modeled.

Original author: dustin at v.igoro.us
Date: 2008-04-13 19:55:26+00:00

Index: buildset.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/buildset.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- buildset.py	22 May 2008 22:13:17 -0000	1.10
+++ buildset.py	22 May 2008 22:13:21 -0000	1.11
@@ -11,7 +11,7 @@
     (source.changes=list)."""
 
     def __init__(self, builderNames, source, reason=None, bsid=None,
-                 custom_props=None, properties=None):
+                 properties=None):
         """
         @param source: a L{buildbot.sourcestamp.SourceStamp}
         """
@@ -19,8 +19,6 @@
         self.source = source
         self.reason = reason
 
-        self.custom_props = custom_props
-
         self.properties = Properties()
         if properties: self.properties.updateFromProperties(properties)
 
@@ -42,7 +40,6 @@
         # create the requests
         for b in builders:
             req = base.BuildRequest(self.reason, self.source, b.name, 
-                                    custom_props=self.custom_props,
                                     properties=self.properties)
             reqs.append((b, req))
             self.requests.append(req)

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- master.py	22 May 2008 22:13:10 -0000	1.115
+++ master.py	22 May 2008 22:13:21 -0000	1.116
@@ -228,14 +228,13 @@
     def detached(self, mind):
         pass
 
-    def perspective_requestBuild(self, buildername, reason, branch, revision, custom_props):
-        assert isinstance(custom_props, dict), \
-               "custom_props must be a dict (not %r)" % (custom_props,)
-
+    def perspective_requestBuild(self, buildername, reason, branch, revision, properties={}):
         c = interfaces.IControl(self.master)
         bc = c.getBuilder(buildername)
         ss = SourceStamp(branch, revision)
-        br = BuildRequest(reason, ss, builderName=buildername, custom_props=custom_props)
+        properties = Properties()
+        properties.update(properties, "remote requestBuild")
+        br = BuildRequest(reason, ss, builderName=buildername, properties=properties)
         bc.requestBuild(br)
 
     def perspective_pingBuilder(self, buildername):

Index: scheduler.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scheduler.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- scheduler.py	22 May 2008 22:13:17 -0000	1.32
+++ scheduler.py	22 May 2008 22:13:21 -0000	1.33
@@ -685,8 +685,7 @@
         self.parent = parent
         self.username = username
 
-    def perspective_try(self, branch, revision, patch, builderNames,
-                        custom_props):
+    def perspective_try(self, branch, revision, patch, builderNames, properties={}):
         log.msg("user %s requesting build on builders %s" % (self.username,
                                                              builderNames))
         for b in builderNames:
@@ -698,11 +697,15 @@
         ss = SourceStamp(branch, revision, patch)
         reason = "'try' job from user %s" % self.username
 
+        # roll the specified props in with our inherited props
+        combined_props = Properties()
+        combined_props.updateFromProperties(self.parent.properties)
+        combined_props.update(properties, "try build")
+
         bs = buildset.BuildSet(builderNames, 
                                ss,
                                reason=reason, 
-                               custom_props=custom_props,
-                               properties=self.parent.properties)
+                               properties=combined_props)
 
         self.parent.submitBuildSet(bs)
 
@@ -728,7 +731,7 @@
     def getPendingBuildTimes(self):
         return []
 
-    def trigger(self, ss, custom_props={}, set_props=None):
+    def trigger(self, ss, set_props=None):
         """Trigger this scheduler. Returns a deferred that will fire when the
         buildset is finished.
         """
@@ -739,7 +742,7 @@
         props.updateFromProperties(self.properties)
         if set_props: props.updateFromProperties(set_props)
 
-        bs = buildset.BuildSet(self.builderNames, ss, custom_props=custom_props, properties=props)
+        bs = buildset.BuildSet(self.builderNames, ss, properties=props)
         d = bs.waitUntilFinished()
         self.submitBuildSet(bs)
         return d




From warner at users.sourceforge.net  Thu May 22 22:13:28 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:28 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process properties.py, 1.5, 1.6
Message-ID: <E1JzJ2O-0003Nn-UQ@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17747/buildbot/process

Modified Files:
	properties.py 
Log Message:
[project @ #124:display-properties-web-status.patch]
Display build properties in the build status page.

Original author: dustin at v.igoro.us
Date: 2008-04-13 20:26:53+00:00

Index: properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/properties.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- properties.py	22 May 2008 22:13:17 -0000	1.5
+++ properties.py	22 May 2008 22:13:26 -0000	1.6
@@ -44,6 +44,12 @@
     def getPropertySource(self, name):
         return self.properties[name][1]
 
+    def asList(self):
+        """Return the properties as a sorted list of (name, value, source)"""
+        l = [ (k, v[0], v[1]) for k,v in self.properties.items() ]
+        l.sort()
+        return l
+
     def __repr__(self):
         return repr(dict([ (k,v[0]) for k,v in self.properties.iteritems() ]))
 




From warner at users.sourceforge.net  Thu May 22 22:13:28 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:28 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps shell.py, 1.22,
	1.23 source.py, 1.14, 1.15
Message-ID: <E1JzJ2O-0005Sx-VO@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17747/buildbot/steps

Modified Files:
	shell.py source.py 
Log Message:
[project @ #124:display-properties-web-status.patch]
Display build properties in the build status page.

Original author: dustin at v.igoro.us
Date: 2008-04-13 20:26:53+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- shell.py	22 May 2008 22:12:57 -0000	1.22
+++ shell.py	22 May 2008 22:13:26 -0000	1.23
@@ -123,7 +123,7 @@
         if isinstance(words, (str, unicode)):
             words = words.split()
         # render() each word to handle WithProperties objects
-        words = [properties.render(word) for word in words]
+        words = properties.render(words)
         if len(words) < 1:
             return ["???"]
         if len(words) == 1:

Index: source.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/source.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- source.py	22 May 2008 22:12:57 -0000	1.14
+++ source.py	22 May 2008 22:13:26 -0000	1.15
@@ -187,7 +187,7 @@
         got_revision = None
         if cmd.updates.has_key("got_revision"):
             got_revision = str(cmd.updates["got_revision"][-1])
-        self.setProperty("got_revision", got_revision, "source")
+        self.setProperty("got_revision", got_revision, "Source")
 
 
 




From warner at users.sourceforge.net  Thu May 22 22:13:28 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:28 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web build.py, 1.17, 1.18
Message-ID: <E1JzJ2O-0005Sr-Tu@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17747/buildbot/status/web

Modified Files:
	build.py 
Log Message:
[project @ #124:display-properties-web-status.patch]
Display build properties in the build status page.

Original author: dustin at v.igoro.us
Date: 2008-04-13 20:26:53+00:00

Index: build.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/build.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- build.py	22 May 2008 22:11:25 -0000	1.17
+++ build.py	22 May 2008 22:13:26 -0000	1.18
@@ -121,6 +121,12 @@
                 data += " </li>\n"
             data += "</ol>\n"
 
+        data += "<h2>Build Properties:</h2>\n"
+        data += "<table><tr><th valign=\"left\">Name</th><th valign=\"left\">Value</th><th valign=\"left\">Source</th></tr>\n"
+        for name, value, source in b.getProperties().asList():
+            data += "<tr><td>%s</td><td>%s</td><td>%s</td></tr>\n" % (name, value, source)
+        data += "</table>"
+            
         data += "<h2>Blamelist:</h2>\n"
         if list(b.getResponsibleUsers()):
             data += " <ol>\n"




From warner at users.sourceforge.net  Thu May 22 22:13:32 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:32 +0000
Subject: [Buildbot-commits] buildbot/docs Makefile, 1.3, 1.4 buildbot.texinfo,
	1.144, 1.145
Message-ID: <E1JzJ2T-0003Pe-FO@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17776/docs

Modified Files:
	Makefile buildbot.texinfo 
Log Message:
[project @ #124:docs.patch]
Add properties to the documentation, along with a nontrivial reorganization
of the scheduler section of the documentation.

Original author: dustin at v.igoro.us
Date: 2008-04-14 18:53:43+00:00

Index: Makefile
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	11 Aug 2006 07:31:23 -0000	1.3
+++ Makefile	22 May 2008 22:13:30 -0000	1.4
@@ -2,10 +2,12 @@
 buildbot.info: buildbot.texinfo
 	makeinfo --fill-column=70 $<
 
-buildbot.html: buildbot.texinfo images-png
+#images-png
+buildbot.html: buildbot.texinfo
 	makeinfo --no-split --html $<
 
-buildbot.ps: buildbot.texinfo images-eps
+#images-eps
+buildbot.ps: buildbot.texinfo
 	texi2dvi $<
 	dvips buildbot.dvi
 	rm buildbot.aux buildbot.cp buildbot.cps buildbot.fn buildbot.ky buildbot.log buildbot.pg buildbot.toc buildbot.tp buildbot.vr

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- buildbot.texinfo	22 May 2008 22:12:22 -0000	1.144
+++ buildbot.texinfo	22 May 2008 22:13:30 -0000	1.145
@@ -109,6 +109,7 @@
 * BuildRequest::                
 * Builder::                     
 * Users::                       
+* Build Properties::
 
 Version Control Systems
 
@@ -130,17 +131,23 @@
 * Loading the Config File::     
 * Testing the Config File::     
 * Defining the Project::        
[...1163 lines suppressed...]
-
- at item slavename
-
-This is a string which identifies which buildslave the build is
-running on.
-
- at end table
-
 @node Python BuildSteps, Transferring Files, Simple ShellCommand Subclasses, Build Steps
 @subsection Python BuildSteps
 
@@ -4883,7 +5147,7 @@
 @subsection Triggering Schedulers
 
 The counterpart to the Triggerable described in section
- at pxref{Build Dependencies} is the Trigger BuildStep.
+ at pxref{Triggerable Scheduler} is the Trigger BuildStep.
 
 @example
 from buildbot.steps.trigger import Trigger




From warner at users.sourceforge.net  Thu May 22 22:13:37 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 22 May 2008 22:13:37 +0000
Subject: [Buildbot-commits] buildbot/docs Makefile,1.4,1.5
Message-ID: <E1JzJ2X-0003R0-AM@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17789/docs

Modified Files:
	Makefile 
Log Message:
[project @ #124:revert-debugging-change.patch]
Revert an accidentally commited change to the Makefile

Original author: dustin at v.igoro.us
Date: 2008-04-17 02:40:10+00:00

Index: Makefile
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	22 May 2008 22:13:30 -0000	1.4
+++ Makefile	22 May 2008 22:13:34 -0000	1.5
@@ -2,12 +2,10 @@
 buildbot.info: buildbot.texinfo
 	makeinfo --fill-column=70 $<
 
-#images-png
-buildbot.html: buildbot.texinfo
+buildbot.html: buildbot.texinfo images-png
 	makeinfo --no-split --html $<
 
-#images-eps
-buildbot.ps: buildbot.texinfo
+buildbot.ps: buildbot.texinfo images-eps
 	texi2dvi $<
 	dvips buildbot.dvi
 	rm buildbot.aux buildbot.cp buildbot.cps buildbot.fn buildbot.ky buildbot.log buildbot.pg buildbot.toc buildbot.tp buildbot.vr




From warner at users.sourceforge.net  Mon May 26 23:52:15 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:15 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps shell.py,1.23,1.24
Message-ID: <E1K0mUB-0002nk-Ix@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22179/buildbot/steps

Modified Files:
	shell.py 
Log Message:
[project @ #232:setproperty-step.patch]
A buildstep that is similar to ShellCommand, except that it captures
the output of the command into a property.

Original author: dustin at v.igoro.us
Date: 2008-05-15 22:22:08+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- shell.py	22 May 2008 22:13:26 -0000	1.23
+++ shell.py	26 May 2008 23:52:13 -0000	1.24
@@ -3,7 +3,7 @@
 import re
 from twisted.python import log
 from buildbot.process.buildstep import LoggingBuildStep, RemoteShellCommand
-from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE
+from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, STDOUT, STDERR
 
 # for existing configurations that import WithProperties from here.  We like
 # to move this class around just to keep our readers guessing.
@@ -211,6 +211,61 @@
             return ["treesize", "%d KiB" % self.kib]
         return ["treesize", "unknown"]
 
+class SetProperty(ShellCommand):
+    name = "setproperty"
+
+    def __init__(self, **kwargs):
+        self.property = None
+        self.extract_fn = None
+        self.strip = True
+
+        if kwargs.has_key('property'):
+            self.property = kwargs['property']
+            del kwargs['property']
+        if kwargs.has_key('extract_fn'):
+            self.extract_fn = kwargs['extract_fn']
+            del kwargs['extract_fn']
+        if kwargs.has_key('strip'):
+            self.strip = kwargs['strip']
+            del kwargs['strip']
+
+        ShellCommand.__init__(self, **kwargs)
+
+        self.addFactoryArguments(property=self.property)
+        self.addFactoryArguments(extract_fn=self.extract_fn)
+        self.addFactoryArguments(strip=self.strip)
+
+        assert self.property or self.extract_fn, \
+            "SetProperty step needs either property= or extract_fn="
+
+        self.property_changes = {}
+
+    def commandComplete(self, cmd):
+        if self.property:
+            result = cmd.logs['stdio'].getText()
+            if self.strip: result = result.strip()
+            propname = render_properties(self.property, self.build)
+            self.setProperty(propname, result)
+            self.property_changes[propname] = result
+        else:
+            log = cmd.logs['stdio']
+            new_props = self.extract_fn(cmd.rc,
+                    ''.join(log.getChunks([STDOUT], onlyText=True)),
+                    ''.join(log.getChunks([STDERR], onlyText=True)))
+            for k,v in new_props.items():
+                self.setProperty(k, v)
+            self.property_changes = new_props
+
+    def createSummary(self, log):
+        props_set = [ "%s: %r" % (k,v) for k,v in self.property_changes.items() ]
+        self.addCompleteLog('property changes', "\n".join(props_set))
+
+    def getText(self, cmd, results):
+        if self.property_changes:
+            return [ "set props:" ] + self.property_changes.keys()
+        else:
+            return [ "no change" ]
+
 class Configure(ShellCommand):
 
     name = "configure"




From warner at users.sourceforge.net  Mon May 26 23:52:15 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:15 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_properties.py, 1.18,
	1.19
Message-ID: <E1K0mUD-0002oN-2Q@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22179/buildbot/test

Modified Files:
	test_properties.py 
Log Message:
[project @ #232:setproperty-step.patch]
A buildstep that is similar to ShellCommand, except that it captures
the output of the command into a property.

Original author: dustin at v.igoro.us
Date: 2008-05-15 22:22:08+00:00

Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- test_properties.py	22 May 2008 22:13:17 -0000	1.18
+++ test_properties.py	26 May 2008 23:52:13 -0000	1.19
@@ -202,5 +202,65 @@
         d.addCallback(_check_touch)
         return d
 
+    SetProperty_base_config = """
+from buildbot.process import factory
+from buildbot.steps.shell import ShellCommand, SetProperty, WithProperties
+from buildbot.buildslave import BuildSlave
+s = factory.s
+
+BuildmasterConfig = c = {}
+c['slaves'] = [BuildSlave('bot1', 'sekrit')]
+c['schedulers'] = []
+c['slavePortnum'] = 0
+
+f1 = factory.BuildFactory([
+##STEPS##
+])
+
+b1 = {'name': 'full1', 'slavename': 'bot1', 'builddir': 'bd1', 'factory': f1}
+c['builders'] = [b1]
+"""
+
+    SetPropertySimple_config = SetProperty_base_config.replace("##STEPS##", """
+        SetProperty(property='foo', command="echo foo"),
+        SetProperty(property=WithProperties('wp'), command="echo wp"),
+        SetProperty(property='bar', command="echo bar", strip=False),
+    """)
+
+    def testSetPropertySimple(self):
+        d = self.master.loadConfig(self.SetPropertySimple_config)
+        d.addCallback(lambda res: self.master.startService())
+        d.addCallback(lambda res: self.connectOneSlave("bot1"))
+        d.addCallback(lambda res: self.requestBuild("full1"))
+        d.addCallback(self.failUnlessBuildSucceeded)
+        def _check_props(bs):
+            self.failUnlessEqual(bs.getProperty("foo"), "foo")
+            self.failUnlessEqual(bs.getProperty("wp"), "wp")
+            # (will this fail on some platforms, due to newline differences?)
+            self.failUnlessEqual(bs.getProperty("bar"), "bar\n")
+            return bs
+        d.addCallback(_check_props)
+        return d
+
+    SetPropertyExtractFn_config = SetProperty_base_config.replace("##STEPS##", """
+        SetProperty(
+            extract_fn=lambda rc,stdout,stderr : {
+                'foo' : stdout.strip(),
+                'bar' : stderr.strip() },
+            command="echo foo; echo bar >&2"),
+    """)
+
+    def testSetPropertyExtractFn(self):
+        d = self.master.loadConfig(self.SetPropertyExtractFn_config)
+        d.addCallback(lambda res: self.master.startService())
+        d.addCallback(lambda res: self.connectOneSlave("bot1"))
+        d.addCallback(lambda res: self.requestBuild("full1"))
+        d.addCallback(self.failUnlessBuildSucceeded)
+        def _check_props(bs):
+            self.failUnlessEqual(bs.getProperty("foo"), "foo")
+            self.failUnlessEqual(bs.getProperty("bar"), "bar")
+            return bs
+        d.addCallback(_check_props)
+        return d
 
 # we test got_revision in test_vc




From warner at users.sourceforge.net  Mon May 26 23:52:15 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:15 +0000
Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.145,1.146
Message-ID: <E1K0mUD-0002oU-96@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22179/docs

Modified Files:
	buildbot.texinfo 
Log Message:
[project @ #232:setproperty-step.patch]
A buildstep that is similar to ShellCommand, except that it captures
the output of the command into a property.

Original author: dustin at v.igoro.us
Date: 2008-05-15 22:22:08+00:00

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- buildbot.texinfo	22 May 2008 22:13:30 -0000	1.145
+++ buildbot.texinfo	26 May 2008 23:52:13 -0000	1.146
@@ -4912,6 +4912,7 @@
 * Compile::                     
 * Test::                        
 * TreeSize::                    
+* Build Properties::            
 @end menu
 
 @node Configure, Compile, Simple ShellCommand Subclasses, Simple ShellCommand Subclasses
@@ -4967,7 +4968,7 @@
 This is meant to handle unit tests. The default command is @code{make
 test}, and the @code{warnOnFailure} flag is set.
 
- at node TreeSize, , Test, Simple ShellCommand Subclasses
+ at node TreeSize, Build Properties, Test, Simple ShellCommand Subclasses
 @subsubsection TreeSize
 
 @bsindex buildbot.steps.shell.TreeSize
@@ -4977,6 +4978,179 @@
 aka 'KiB' or 'kibibytes') on the step's status text, and sets a build
 property named 'tree-size-KiB' with the same value.
 
+ at node SetProperty
+ at subsubsection SetProperty
+
+ at node Build Properties,  , TreeSize, Simple ShellCommand Subclasses
+ at subsubsection Build Properties
+
+ at cindex build properties
+
+Each build has a set of ``Build Properties'', which can be used by its
+BuildStep to modify their actions. For example, the SVN revision
+number of the source code being built is available as a build
+property, and a ShellCommand step could incorporate this number into a
+command which create a numbered release tarball.
+
+Some build properties are set when the build starts, such as the
+SourceStamp information. Other properties can be set by BuildSteps as
+they run, for example the various Source steps will set the
+ at code{got_revision} property to the source revision that was actually
+checked out (which can be useful when the SourceStamp in use merely
+requested the ``latest revision'': @code{got_revision} will tell you
+what was actually built).
+
+ at itemize
+ at item buildername
+Name of this builder
+ at item buildnumber
+Number of this build (numbers are unique within the builder)
+ at item branch
+Branch of the source being built, from the SourceStamp
+ at item revision
+Revision of the source being built, from the SourceStamp, as a string
+ at item scheduler
+The name of the scheduler that invoked this build
+ at item slavename
+The name of the buildslave performing this build
+ at end itemize
+
+In custom BuildSteps, you can get and set the build properties with
+the @code{getProperty}/@code{setProperty} methods. Each takes a string
+for the name of the property, and returns or accepts an
+arbitrary at footnote{Build properties are serialized along with the
+build results, so they must be serializable. For this reason, the
+value of any build property should be simple inert data: strings,
+numbers, lists, tuples, and dictionaries. They should not contain
+class instances.} object. For example:
+
+ at example
+class MakeTarball(ShellCommand):
+    def start(self):
+        self.setCommand(["tar", "czf",
+                         "build-%s.tar.gz" % self.getProperty("revision"),
+                         "source"])
+        ShellCommand.start(self)
+ at end example
+
+ at cindex WithProperties
+
+You can use build properties in ShellCommands by using the
+ at code{WithProperties} wrapper when setting the arguments of the
+ShellCommand. This interpolates the named build properties into the
+generated shell command. You can also use a @code{WithProperties} as
+the @code{workdir=} argument: this allows the working directory for a
+command to be varied for each build, depending upon various build
+properties.
+
+ at example
+from buildbot.steps.shell import ShellCommand, WithProperties
+
+f.addStep(ShellCommand,
+          command=["tar", "czf",
+                   WithProperties("build-%s.tar.gz", "revision"),
+                   "source"])
+ at end example
+
+If this BuildStep were used in a tree obtained from Subversion, it
+would create a tarball with a name like @file{build-1234.tar.gz}.
+
+The @code{WithProperties} function does @code{printf}-style string
+interpolation, using strings obtained by calling
+ at code{build.getProperty(propname)}. Note that for every @code{%s} (or
+ at code{%d}, etc), you must have exactly one additional argument to
+indicate which build property you want to insert.
+
+
+You can also use python dictionary-style string interpolation by using
+the @code{%(propname)s} syntax. In this form, the property name goes
+in the parentheses, and WithProperties takes @emph{no} additional
+arguments:
+
+ at example
+f.addStep(ShellCommand,
+          command=["tar", "czf",
+                   WithProperties("build-%(revision)s.tar.gz"),
+                   "source"])
+ at end example
+
+Don't forget the extra ``s'' after the closing parenthesis! This is
+the cause of many confusing errors. Also note that you can only use
+WithProperties in the list form of the command= definition. You cannot
+currently use it in the (discouraged) @code{command="stuff"}
+single-string form. However, you can use something like
+ at code{command=["/bin/sh", "-c", "stuff", WithProperties(stuff)]} to
+use both shell expansion and WithProperties interpolation.
+
+Note that, like python, you can either do positional-argument
+interpolation @emph{or} keyword-argument interpolation, not both. Thus
+you cannot use a string like
+ at code{WithProperties("foo-%(revision)s-%s", "branch")}.
+
+At the moment, the only way to set build properties is by writing a
+custom BuildStep.
+
+ at heading Common Build Properties
+
+The following build properties are set when the build is started, and
+are available to all steps.
+
+ at table @code
+ at item branch
+
+This comes from the build's SourceStamp, and describes which branch is
+being checked out. This will be @code{None} (which interpolates into
+ at code{WithProperties} as an empty string) if the build is on the
+default branch, which is generally the trunk. Otherwise it will be a
+string like ``branches/beta1.4''. The exact syntax depends upon the VC
+system being used.
+
+ at item revision
+
+This also comes from the SourceStamp, and is the revision of the
+source code tree that was requested from the VC system. When a build
+is requested of a specific revision (as is generally the case when the
+build is triggered by Changes), this will contain the revision
+specification. The syntax depends upon the VC system in use: for SVN
+it is an integer, for Mercurial it is a short string, for Darcs it is
+a rather large string, etc.
+
+If the ``force build'' button was pressed, the revision will be
+ at code{None}, which means to use the most recent revision available.
+This is a ``trunk build''. This will be interpolated as an empty
+string.
+
+ at item got_revision
+
+This is set when a Source step checks out the source tree, and
+provides the revision that was actually obtained from the VC system.
+In general this should be the same as @code{revision}, except for
+trunk builds, where @code{got_revision} indicates what revision was
+current when the checkout was performed. This can be used to rebuild
+the same source code later.
+
+Note that for some VC systems (Darcs in particular), the revision is a
+large string containing newlines, and is not suitable for
+interpolation into a filename.
+
+ at item buildername
+
+This is a string that indicates which Builder the build was a part of.
+The combination of buildername and buildnumber uniquely identify a
+build.
+
+ at item buildnumber
+
+Each build gets a number, scoped to the Builder (so the first build
+performed on any given Builder will have a build number of 0). This
+integer property contains the build's number.
+
+ at item slavename
+
+This is a string which identifies which buildslave the build is
+running on.
+
+ at end table
 
 @node Python BuildSteps, Transferring Files, Simple ShellCommand Subclasses, Build Steps
 @subsection Python BuildSteps




From warner at users.sourceforge.net  Mon May 26 23:52:20 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:20 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status words.py,1.52,1.53
Message-ID: <E1K0mUH-00028d-Lj@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22205/buildbot/status

Modified Files:
	words.py 
Log Message:
[project @ #171:buildbot_irc.patch]
Patch by Neil Hemingway <nhemingway at googlemail.com>: allow the IRC daemon
to notify users on build events, either via private messages or channel
messages

Original author: dustin at v.igoro.us
Date: 2008-05-15 22:35:38+00:00

Index: words.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/words.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- words.py	1 Nov 2007 06:42:21 -0000	1.52
+++ words.py	26 May 2008 23:52:18 -0000	1.53
@@ -66,6 +66,8 @@
 
     def __init__(self, channel):
         self.channel = channel
+        self.notify_events = {}
+        self.subscribed = 0
 
     silly = {
         "What happen ?": "Somebody set up us the bomb.",
@@ -165,6 +167,77 @@
         self.emit_status(which)
     command_STATUS.usage = "status [<which>] - List status of a builder (or all builders)"
 
+    def validate_notification_event(self, event):
+        if not re.compile("^(started|finished|success|failed|exception)$").match(event):
+            raise UsageError("try 'notify on|off <EVENT>'")
+
+    def list_notified_events(self):
+        self.send( "The following events are being notified: %r" % self.notify_events.keys() )
+
+    def notify_for(self, *events):
+        for event in events:
+            if self.notify_events.has_key(event):
+                return 1
+        return 0
+
+    def subscribe_to_build_events(self):
+        self.channel.status.subscribe(self)
+        self.subscribed = 1
+
+    def unsubscribe_from_build_events(self):
+        self.channel.status.unsubscribe(self)
+        self.subscribed = 0
+
+    def add_notification_events(self, events):
+        for event in events:
+            self.validate_notification_event(event)
+            self.notify_events[event] = 1
+
+    def remove_notification_events(self, events):
+        for event in events:
+            self.validate_notification_event(event)
+            del self.notify_events[event]
+
+    def remove_all_notification_events(self):
+        self.notify_events = {}
+
+    def command_NOTIFY(self, args, who):
+        args = args.split()
+
+        if not args:
+            raise UsageError("try 'notify on|off|list <EVENT>'")
+        action = args.pop(0)
+        events = args
+
+        if action == "on":
+            if not events: events = ('started','finished')
+            self.add_notification_events(events)
+
+            self.list_notified_events()
+
+        elif action == "off":
+            if events:
+                self.remove_notification_events(events)
+            else:
+                self.remove_all_notification_events()
+
+            self.list_notified_events()
+
+        elif action == "list":
+            self.list_notified_events()
+            return
+
+        else:
+            raise UsageError("try 'notify on|off <EVENT>'")
+
+        if len(self.notify_events) > 0 and not self.subscribed:
+            self.subscribe_to_build_events()
+
+        elif len(self.notify_events) == 0 and self.subscribed:
+            self.unsubscribe_from_build_events()
+
+    command_NOTIFY.usage = "notify on|off|list [<EVENT>] ... - Notify me about build events.  event should be one or more of: 'started', 'finished', 'failed', 'success', 'exception', 'successToFailed', 'failedToSuccess'"
+
     def command_WATCH(self, args, who):
         args = args.split()
         if len(args) != 1:
@@ -178,7 +251,7 @@
         for build in builds:
             assert not build.isFinished()
             d = build.waitUntilFinished()
-            d.addCallback(self.buildFinished)
+            d.addCallback(self.watchedBuildFinished)
             r = "watching build %s #%d until it finishes" \
                 % (which, build.getNumber())
             eta = build.getETA()
@@ -188,7 +261,89 @@
             self.send(r)
     command_WATCH.usage = "watch <which> - announce the completion of an active build"
 
-    def buildFinished(self, b):
+    def buildsetSubmitted(self, buildset):
+        log.msg('[Contact] Buildset %s added' % (buildset))
+
+    def builderAdded(self, builderName, builder):
+        log.msg('[Contact] Builder %s added' % (builder))
+        builder.subscribe(self)
+
+    def builderChangedState(self, builderName, state):
+        log.msg('[Contact] Builder %s changed state to %s' % (builderName, state))
+
+    def builderRemoved(self, builderName):
+        log.msg('[Contact] Builder %s removed' % (builderName))
+
+    def buildStarted(self, builderName, build):
+        builder = build.getBuilder()
+        log.msg('[Contact] Builder %r in category %s started' % (builder, builder.category))
+
+        # only notify about builders we are interested in
+
+        if (self.channel.categories != None and
+           builder.category not in self.channel.categories):
+            log.msg('Not notifying for a build in the wrong category')
+            return
+
+        if not self.notify_for('started'):
+            log.msg('Not notifying for a build when started-notification disabled')
+            return
+
+        r = "build #%d of %s started" % \
+           (build.getNumber(),
+             builder.getName())
+
+        r += " including [" + ", ".join(map(lambda c: repr(c.revision), build.getChanges())) + "]"
+
+        self.send(r)
+
+    def buildFinished(self, builderName, build, results):
+        builder = build.getBuilder()
+
+        results_descriptions = {
+            SUCCESS: "Success",
+            WARNINGS: "Warnings",
+            FAILURE: "Failure",
+            EXCEPTION: "Exception",
+            }
+
+        # only notify about builders we are interested in
+        log.msg('[Contact] builder %r in category %s finished' % (builder, builder.category))
+
+        if not self.notify_for('finished', 'failed', 'success', 'exception', 'failedToSuccess', 'successToFailed'):
+            return
+
+        if (self.channel.categories != None and
+            builder.category not in self.channel.categories):
+            return
+
+        results = build.getResults()
+
+        r = "build #%d of %s is complete: %s" % \
+            (build.getNumber(),
+             builder.getName(),
+             results_descriptions.get(results, "??"))
+        r += " [%s]" % " ".join(build.getText())
+        buildurl = self.channel.status.getURLForThing(build)
+        if buildurl:
+            r += "  Build details are at %s" % buildurl
+
+        if (self.notify_for('finished')) or \
+           (self.notify_for('success') and results == SUCCESS) or \
+           (self.notify_for('failed') and results == FAILURE) or \
+           (self.notify_for('exception') and results == EXCEPTION):
+            self.send(r)
+            return
+
+        prevBuild = build.getPreviousBuild()
+        if prevBuild:
+            prevResult = prevBuild.getResult()
+
+            if (self.notify_for('failureToSuccess') and prevResult == FAILURE and results == SUCCESS) or \
+               (self.notify_for('successToFailure') and prevResult == SUCCESS and results == FAILURE):
+                self.send(r)
+
+    def watchedBuildFinished(self, b):
         results = {SUCCESS: "Success",
                    WARNINGS: "Warnings",
                    FAILURE: "Failure",
@@ -429,6 +584,20 @@
     def act(self, action):
         self.channel.me(self.dest, action)
 
+    def command_JOIN(self, args, who):
+        args = args.split()
+        to_join = args[0]
+        self.channel.join(to_join)
+        self.send("Joined %s" % to_join)
+    command_JOIN.usage = "join channel - Join another channel"
+
+    def command_LEAVE(self, args, who):
+        args = args.split()
+        to_leave = args[0]
+        self.send("Buildbot has been told to leave %s" % to_leave)
+        self.channel.part(to_leave)
+    command_LEAVE.usage = "leave channel - Leave a channel"
+
 
     def handleMessage(self, message, who):
         # a message has arrived from 'who'. For broadcast contacts (i.e. when
@@ -541,7 +710,7 @@
         # else it's a broadcast message, maybe for us, maybe not. 'channel'
         # is '#twisted' or the like.
         contact = self.getContact(channel)
-        if message.startswith("%s:" % self.nickname):
+        if message.startswith("%s:" % self.nickname) or message.startswith("%s," % self.nickname):
             message = message[len("%s:" % self.nickname):]
             contact.handleMessage(message, user)
         # to track users comings and goings, add code here




From warner at users.sourceforge.net  Mon May 26 23:52:21 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:21 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_status.py, 1.45, 1.46
Message-ID: <E1K0mUH-00028Y-Ky@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22205/buildbot/test

Modified Files:
	test_status.py 
Log Message:
[project @ #171:buildbot_irc.patch]
Patch by Neil Hemingway <nhemingway at googlemail.com>: allow the IRC daemon
to notify users on build events, either via private messages or channel
messages

Original author: dustin at v.igoro.us
Date: 2008-05-15 22:35:38+00:00

Index: test_status.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_status.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- test_status.py	7 Aug 2007 19:21:40 -0000	1.45
+++ test_status.py	26 May 2008 23:52:18 -0000	1.46
@@ -9,7 +9,8 @@
 from buildbot import interfaces
 from buildbot.sourcestamp import SourceStamp
 from buildbot.process.base import BuildRequest
-from buildbot.status import builder, base
+from buildbot.status import builder, base, words
+from buildbot.changes.changes import Change
 
 mail = None
 try:
@@ -980,3 +981,216 @@
         self.failUnless(isinstance(b2, client.RemoteBuilder))
         b3 = client.makeRemote(None)
         self.failUnless(b3 is None)
+
+
+class ContactTester(unittest.TestCase):
+    def test_notify_invalid_syntax(self):
+        irc = MyContact()
+        self.assertRaises(words.UsageError, lambda args, who: irc.command_NOTIFY(args, who), "", "mynick")
+
+    def test_notify_list(self):
+        irc = MyContact()
+        irc.command_NOTIFY("list", "mynick")
+        self.failUnlessEqual(irc.message, "The following events are being notified: []", "empty notify list")
+
+        irc.message = ""
+        irc.command_NOTIFY("on started", "mynick")
+        self.failUnlessEqual(irc.message, "The following events are being notified: ['started']", "on started")
+
+        irc.message = ""
+        irc.command_NOTIFY("on finished", "mynick")
+        self.failUnlessEqual(irc.message, "The following events are being notified: ['started', 'finished']", "on finished")
+
+        irc.message = ""
+        irc.command_NOTIFY("off", "mynick")
+        self.failUnlessEqual(irc.message, "The following events are being notified: []", "off all")
+
+        irc.message = ""
+        irc.command_NOTIFY("on", "mynick")
+        self.failUnlessEqual(irc.message, "The following events are being notified: ['started', 'finished']", "on default set")
+
+        irc.message = ""
+        irc.command_NOTIFY("off started", "mynick")
+        self.failUnlessEqual(irc.message, "The following events are being notified: ['finished']", "off started")
+
+        irc.message = ""
+        irc.command_NOTIFY("on success failed exception", "mynick")
+        self.failUnlessEqual(irc.message, "The following events are being notified: ['failed', 'finished', 'exception', 'success']", "on multiple events")
+
+    def test_notification_default(self):
+        irc = MyContact()
+
+        my_builder = MyBuilder("builder78")
+        my_build = MyIrcBuild(my_builder, 23, builder.SUCCESS)
+
+        irc.buildStarted(my_builder.getName(), my_build)
+        self.failUnlessEqual(irc.message, "", "No notification with default settings")
+
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "", "No notification with default settings")
+
+    def test_notification_started(self):
+        irc = MyContact()
+
+        my_builder = MyBuilder("builder78")
+        my_build = MyIrcBuild(my_builder, 23, builder.SUCCESS)
+        my_build.changes = (
+            Change(who = 'author1', files = ['file1'], comments = 'comment1', revision = 123),
+            Change(who = 'author2', files = ['file2'], comments = 'comment2', revision = 456),
+            )
+
+        irc.command_NOTIFY("on started", "mynick")
+
+        irc.message = ""
+        irc.buildStarted(my_builder.getName(), my_build)
+        self.failUnlessEqual(irc.message, "build #23 of builder78 started including [123, 456]", "Start notification generated with notify_events=['started']")
+
+        irc.message = ""
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "", "No finished notification with notify_events=['started']")
+
+    def test_notification_finished(self):
+        irc = MyContact()
+
+        my_builder = MyBuilder("builder834")
+        my_build = MyIrcBuild(my_builder, 862, builder.SUCCESS)
+        my_build.changes = (
+            Change(who = 'author1', files = ['file1'], comments = 'comment1', revision = 943),
+            )
+
+        irc.command_NOTIFY("on finished", "mynick")
+
+        irc.message = ""
+        irc.buildStarted(my_builder.getName(), my_build)
+        self.failUnlessEqual(irc.message, "", "No started notification with notify_events=['finished']")
+
+        irc.message = ""
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "build #862 of builder834 is complete: Success [step1 step2]  Build details are at http://myserver/mypath?build=765", "Finish notification generated with notify_events=['finished']")
+
+    def test_notification_success(self):
+        irc = MyContact()
+
+        my_builder = MyBuilder("builder834")
+        my_build = MyIrcBuild(my_builder, 862, builder.SUCCESS)
+        my_build.changes = (
+            Change(who = 'author1', files = ['file1'], comments = 'comment1', revision = 943),
+            )
+
+        irc.command_NOTIFY("on success", "mynick")
+
+        irc.message = ""
+        irc.buildStarted(my_builder.getName(), my_build)
+        self.failUnlessEqual(irc.message, "", "No started notification with notify_events=['success']")
+
+        irc.message = ""
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "build #862 of builder834 is complete: Success [step1 step2]  Build details are at http://myserver/mypath?build=765", "Finish notification generated on success with notify_events=['success']")
+
+        irc.message = ""
+        my_build.results = builder.FAILURE
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "", "No finish notification generated on failure with notify_events=['success']")
+
+        irc.message = ""
+        my_build.results = builder.EXCEPTION
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "", "No finish notification generated on exception with notify_events=['success']")
+
+    def test_notification_failed(self):
+        irc = MyContact()
+
+        my_builder = MyBuilder("builder834")
+        my_build = MyIrcBuild(my_builder, 862, builder.FAILURE)
+        my_build.changes = (
+            Change(who = 'author1', files = ['file1'], comments = 'comment1', revision = 943),
+            )
+
+        irc.command_NOTIFY("on failed", "mynick")
+
+        irc.message = ""
+        irc.buildStarted(my_builder.getName(), my_build)
+        self.failUnlessEqual(irc.message, "", "No started notification with notify_events=['failed']")
+
+        irc.message = ""
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "build #862 of builder834 is complete: Failure [step1 step2]  Build details are at http://myserver/mypath?build=765", "Finish notification generated on failure with notify_events=['failed']")
+
+        irc.message = ""
+        my_build.results = builder.SUCCESS
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "", "No finish notification generated on success with notify_events=['failed']")
+
+        irc.message = ""
+        my_build.results = builder.EXCEPTION
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "", "No finish notification generated on exception with notify_events=['failed']")
+
+    def test_notification_exception(self):
+        irc = MyContact()
+
+        my_builder = MyBuilder("builder834")
+        my_build = MyIrcBuild(my_builder, 862, builder.EXCEPTION)
+        my_build.changes = (
+            Change(who = 'author1', files = ['file1'], comments = 'comment1', revision = 943),
+            )
+
+        irc.command_NOTIFY("on exception", "mynick")
+
+        irc.message = ""
+        irc.buildStarted(my_builder.getName(), my_build)
+        self.failUnlessEqual(irc.message, "", "No started notification with notify_events=['exception']")
+
+        irc.message = ""
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "build #862 of builder834 is complete: Exception [step1 step2]  Build details are at http://myserver/mypath?build=765", "Finish notification generated on failure with notify_events=['exception']")
+
+        irc.message = ""
+        my_build.results = builder.SUCCESS
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "", "No finish notification generated on success with notify_events=['exception']")
+
+        irc.message = ""
+        my_build.results = builder.FAILURE
+        irc.buildFinished(my_builder.getName(), my_build, None)
+        self.failUnlessEqual(irc.message, "", "No finish notification generated on exception with notify_events=['exception']")
+
+class MyIrcBuild(builder.BuildStatus):
+    results = None
+
+    def __init__(self, parent, number, results):
+        builder.BuildStatus.__init__(self, parent, number)
+        self.results = results
+
+    def getResults(self):
+        return self.results
+
+    def getText(self):
+        return ('step1', 'step2')
+
+class URLProducer:
+    def getURLForThing(self, build):
+        return 'http://myserver/mypath?build=765'
+
+class MyChannel:
+    categories = None
+    status = URLProducer()
+
+    def __init__(self):
+        pass
+
+class MyContact(words.Contact):
+    message = ""
+
+    def __init__(self, channel = MyChannel()):
+        words.Contact.__init__(self, channel)
+        self.message = ""
+
+    def subscribe_to_build_events(self):
+        pass
+
+    def unsubscribe_from_build_events(self):
+        pass
+
+    def send(self, msg):
+        self.message += msg




From warner at users.sourceforge.net  Mon May 26 23:52:21 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:21 +0000
Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.146,1.147
Message-ID: <E1K0mUH-0002pu-RF@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22205/docs

Modified Files:
	buildbot.texinfo 
Log Message:
[project @ #171:buildbot_irc.patch]
Patch by Neil Hemingway <nhemingway at googlemail.com>: allow the IRC daemon
to notify users on build events, either via private messages or channel
messages

Original author: dustin at v.igoro.us
Date: 2008-05-15 22:35:38+00:00

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- buildbot.texinfo	26 May 2008 23:52:13 -0000	1.146
+++ buildbot.texinfo	26 May 2008 23:52:19 -0000	1.147
@@ -7166,6 +7166,32 @@
 finished and then announce the results.
 @item last BUILDER
 Return the results of the last build to run on the given Builder.
+ at item join CHANNEL
+Join the given IRC channel
+ at item leave CHANNEL
+Leave the given IRC channel
+ at item notify on|off|list EVENT
+Report events relating to builds.  If the command is issued as a
+private message, then the report will be sent back as a private
+message to the user who issued the command.  Otherwise, the report
+will be sent to the channel.  Available events to be notified are:
+
+ at table
+ at item started
+A build has started
+ at item finished
+A build has finished
+ at item success
+A build finished successfully
+ at item failed
+A build failed
+ at item exception
+A build generated and exception
+ at item successToFailure
+The previous build was successful, but this one failed
+ at item failureToSuccess
+The previous build failed, but this one was successful
+ at end table
 
 @item help COMMAND
 Describe a command. Use @code{help commands} to get a list of known




From warner at users.sourceforge.net  Mon May 26 23:52:25 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:25 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process properties.py, 1.6, 1.7
Message-ID: <E1K0mUM-0002rC-6V@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22229/buildbot/process

Modified Files:
	properties.py 
Log Message:
[project @ #234:shell-style-substitutions.patch]
Add support for shell-style substitutions, e.g.,
%(propname:-replacement)s and %(propname:+replacement)s

Original author: dustin at v.igoro.us
Date: 2008-04-15 04:31:40+00:00

Index: properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/properties.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- properties.py	22 May 2008 22:13:26 -0000	1.6
+++ properties.py	26 May 2008 23:52:23 -0000	1.7
@@ -1,3 +1,5 @@
+import re
+import weakref
 from zope.interface import implements
 from buildbot import util
 from twisted.python import log
@@ -26,19 +28,28 @@
         @param kwargs: initial property values (for testing)
         """
         self.properties = {}
+        self.pmap = PropertyMap(self)
         if kwargs: self.update(kwargs, "TEST")
 
+    def __getstate__(self):
+        d = self.__dict__.copy()
+        del d['pmap']
+        return d
+
+    def __setstate__(self, d):
+        self.__dict__ = d
+        self.pmap = PropertyMap(self)
+
     def __getitem__(self, name):
-        """Just get the value for this property, special-casing None -> ''"""
+        """Just get the value for this property."""
         rv = self.properties[name][0]
-        if rv is None: rv = ''
         return rv
 
     def has_key(self, name):
         return self.properties.has_key(name)
 
     def getProperty(self, name, default=None):
-        """Get the value for the given property, with no None -> '' special case"""
+        """Get the value for the given property."""
         return self.properties.get(name, (default,))[0]
 
     def getPropertySource(self, name):
@@ -54,6 +65,7 @@
         return repr(dict([ (k,v[0]) for k,v in self.properties.iteritems() ]))
 
     def setProperty(self, name, value, source):
+        self._wpmap = None
         self.properties[name] = (value, source)
 
     def update(self, dict, source):
@@ -73,7 +85,7 @@
         if isinstance(value, (str, unicode)):
             return value
         elif isinstance(value, WithProperties):
-            return value.render(self)
+            return value.render(self.pmap)
         elif isinstance(value, list):
             return [ self.render(e) for e in value ]
         elif isinstance(value, tuple):
@@ -83,6 +95,39 @@
         else:
             return value
 
+class PropertyMap:
+    colon_minus_re = re.compile(r"(.*):-(.*)")
+    colon_plus_re = re.compile(r"(.*):\+(.*)")
+    def __init__(self, properties):
+        # use weakref here to avoid a reference loop
+        self.properties = weakref.ref(properties)
+
+    def __getitem__(self, key):
+        properties = self.properties()
+        assert properties is not None
+
+        mo = self.colon_minus_re.match(key)
+        if mo:
+            prop, repl = mo.group(1,2)
+            if properties.has_key(prop):
+                rv = properties[prop]
+            else:
+                rv = repl
+        else:
+            mo = self.colon_plus_re.match(key)
+            if mo:
+                prop, repl = mo.group(1,2)
+                if properties.has_key(prop):
+                    rv = repl
+                else:
+                    rv = ''
+            else:
+                rv = properties[key]
+
+        # translate 'None' to an empty string
+        if rv is None: rv = ''
+        return rv
+
 class WithProperties(util.ComparableMixin):
     """This is a marker class, used in ShellCommand's command= argument to
     indicate that we want to interpolate a build property.
@@ -94,12 +139,12 @@
         self.fmtstring = fmtstring
         self.args = args
 
-    def render(self, properties):
+    def render(self, pmap):
         if self.args:
             strings = []
             for name in self.args:
-                strings.append(properties[name])
+                strings.append(pmap[name])
             s = self.fmtstring % tuple(strings)
         else:
-            s = self.fmtstring % properties
+            s = self.fmtstring % pmap
         return s




From warner at users.sourceforge.net  Mon May 26 23:52:25 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:25 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_properties.py, 1.19,
	1.20
Message-ID: <E1K0mUN-00029V-D7@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22229/buildbot/test

Modified Files:
	test_properties.py 
Log Message:
[project @ #234:shell-style-substitutions.patch]
Add support for shell-style substitutions, e.g.,
%(propname:-replacement)s and %(propname:+replacement)s

Original author: dustin at v.igoro.us
Date: 2008-04-15 04:31:40+00:00

Index: test_properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_properties.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- test_properties.py	26 May 2008 23:52:13 -0000	1.19
+++ test_properties.py	26 May 2008 23:52:23 -0000	1.20
@@ -47,12 +47,6 @@
         self.assertRaises(KeyError, lambda : self.props['do-nothing'])
         self.failUnlessEqual(self.props.getProperty('do-install'), 2)
 
-    def testEmpty(self):
-        # test the special case for Null
-        self.props.setProperty("x", None, "hi")
-        self.failUnlessEqual(self.props.getProperty('x'), None)
-        self.failUnlessEqual(self.props['x'], '')
-
     def testUpdate(self):
         self.props.setProperty("x", 24, "old")
         newprops = { 'a' : 1, 'b' : 2 }
@@ -95,6 +89,20 @@
         self.failUnlessEqual(self.props.render(command),
                              "build-foo.tar.gz")
 
+    def testDictColonMinus(self):
+        # test dict-style substitution with WithProperties
+        self.props.setProperty("prop1", "foo", "test")
+        command = WithProperties("build-%(prop1:-empty)s-%(prop2:-empty)s.tar.gz")
+        self.failUnlessEqual(self.props.render(command),
+                             "build-foo-empty.tar.gz")
+
+    def testDictColonPlus(self):
+        # test dict-style substitution with WithProperties
+        self.props.setProperty("prop1", "foo", "test")
+        command = WithProperties("build-%(prop1:+exists)s-%(prop2:+exists)s.tar.gz")
+        self.failUnlessEqual(self.props.render(command),
+                             "build-exists-.tar.gz")
+
     def testEmpty(self):
         # None should render as ''
         self.props.setProperty("empty", None, "test")




From warner at users.sourceforge.net  Mon May 26 23:52:25 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:25 +0000
Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.147,1.148
Message-ID: <E1K0mUN-00029a-D1@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22229/docs

Modified Files:
	buildbot.texinfo 
Log Message:
[project @ #234:shell-style-substitutions.patch]
Add support for shell-style substitutions, e.g.,
%(propname:-replacement)s and %(propname:+replacement)s

Original author: dustin at v.igoro.us
Date: 2008-04-15 04:31:40+00:00

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- buildbot.texinfo	26 May 2008 23:52:19 -0000	1.147
+++ buildbot.texinfo	26 May 2008 23:52:23 -0000	1.148
@@ -4137,12 +4137,11 @@
 @cindex WithProperties
 
 You can use build properties in ShellCommands by using the
- at code{WithProperties} wrapper when setting the arguments of the
-ShellCommand. This interpolates the named build properties into the
-generated shell command. You can also use a @code{WithProperties}
-as the @code{workdir=} argument: this allows the working directory
-for a command to be varied for each build, depending upon various
-build properties.
+ at code{WithProperties} wrapper when setting the arguments of
+the ShellCommand. This interpolates the named build properties
+into the generated shell command.  Most step parameters accept
+ at code{WithProperties}.  Please file bugs for any parameters which
+do not.
 
 @example
 from buildbot.steps.shell import ShellCommand
@@ -4178,13 +4177,29 @@
 Don't forget the extra ``s'' after the closing parenthesis! This is
 the cause of many confusing errors. 
 
-Note that, like python, you can either do positional-argument
-interpolation @emph{or} keyword-argument interpolation, not both. Thus
-you cannot use a string like
- at code{WithProperties("foo-%(revision)s-%s", "branch")}.
+The dictionary-style interpolation supports a number of more advanced
+syntaxes, too.
 
-Most step parameters accept @code{WithProperties}.  Please file bugs
-for any parameters which do not.
+ at table @code
+
+ at item propname:-replacement
+If @code{propname} exists, substitute its value; otherwise,
+substitute @code{replacement}.  @code{replacement} may be empty
+(@code{%(propname:-)s})
+
+ at item propname:+replacement
+If @code{propname} exists, substitute @code{replacement}; otherwise,
+substitute an empty string.
+
+ at end table
+
+Although these are similar to shell substitutions, no other
+substitutions are currently supported, and @code{replacement} in the
+above cannot contain more substitutions.
+
+Note: like python, you can either do positional-argument interpolation
+ at emph{or} keyword-argument interpolation, not both. Thus you cannot use
+a string like @code{WithProperties("foo-%(revision)s-%s", "branch")}.
 
 @heading Common Build Properties
 




From warner at users.sourceforge.net  Mon May 26 23:52:29 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:29 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process properties.py, 1.7, 1.8
Message-ID: <E1K0mUQ-0002Aj-1p@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22252/buildbot/process

Modified Files:
	properties.py 
Log Message:
[project @ #124:properties_py_comments.patch]
Additional comments, docstrings in properties.py

Original author: dustin at v.igoro.us
Date: 2008-04-15 15:17:50+00:00

Index: properties.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/properties.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- properties.py	26 May 2008 23:52:23 -0000	1.7
+++ properties.py	26 May 2008 23:52:27 -0000	1.8
@@ -65,7 +65,6 @@
         return repr(dict([ (k,v[0]) for k,v in self.properties.iteritems() ]))
 
     def setProperty(self, name, value, source):
-        self._wpmap = None
         self.properties[name] = (value, source)
 
     def update(self, dict, source):
@@ -82,6 +81,8 @@
         Return a variant of value that has any WithProperties objects
         substituted.  This recurses into Python's compound data types.
         """
+        # we use isinstance to detect Python's standard data types, and call
+        # this function recursively for the values in those types
         if isinstance(value, (str, unicode)):
             return value
         elif isinstance(value, WithProperties):
@@ -96,6 +97,10 @@
             return value
 
 class PropertyMap:
+    """
+    Privately-used mapping object to implement WithProperties' substitutions,
+    including the rendering of None as ''.
+    """
     colon_minus_re = re.compile(r"(.*):-(.*)")
     colon_plus_re = re.compile(r"(.*):\+(.*)")
     def __init__(self, properties):
@@ -106,6 +111,8 @@
         properties = self.properties()
         assert properties is not None
 
+        # %(prop:-repl)s
+        # if prop exists, use it; otherwise, use repl
         mo = self.colon_minus_re.match(key)
         if mo:
             prop, repl = mo.group(1,2)
@@ -114,6 +121,8 @@
             else:
                 rv = repl
         else:
+            # %(prop:+repl)s
+            # if prop exists, use repl; otherwise, an empty string
             mo = self.colon_plus_re.match(key)
             if mo:
                 prop, repl = mo.group(1,2)
@@ -129,8 +138,9 @@
         return rv
 
 class WithProperties(util.ComparableMixin):
-    """This is a marker class, used in ShellCommand's command= argument to
-    indicate that we want to interpolate a build property.
+    """
+    This is a marker class, used fairly widely to indicate that we
+    want to interpolate build properties.
     """
 
     compare_attrs = ('fmtstring', 'args')




From warner at users.sourceforge.net  Mon May 26 23:52:33 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 26 May 2008 23:52:33 +0000
Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.148,1.149
Message-ID: <E1K0mUW-0002t6-JI@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22264/docs

Modified Files:
	buildbot.texinfo 
Log Message:
[project @ #124:conflict-resolution]

Original author: dustin at v.igoro.us
Date: 2008-05-15 22:41:32+00:00

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- buildbot.texinfo	26 May 2008 23:52:23 -0000	1.148
+++ buildbot.texinfo	26 May 2008 23:52:31 -0000	1.149
@@ -4927,6 +4927,7 @@
 * Compile::                     
 * Test::                        
 * TreeSize::                    
+* SetProperty::                    
 * Build Properties::            
 @end menu
 
@@ -4983,7 +4984,7 @@
 This is meant to handle unit tests. The default command is @code{make
 test}, and the @code{warnOnFailure} flag is set.
 
- at node TreeSize, Build Properties, Test, Simple ShellCommand Subclasses
+ at node TreeSize
 @subsubsection TreeSize
 
 @bsindex buildbot.steps.shell.TreeSize
@@ -4996,7 +4997,47 @@
 @node SetProperty
 @subsubsection SetProperty
 
- at node Build Properties,  , TreeSize, Simple ShellCommand Subclasses
+ at bsindex buildbot.steps.shell.SetProperty
+
+This buildstep is similar to ShellCommand, except that it captures the
+output of the command into a property.  It is usually used like this:
+
+ at example
+f.addStep(SetProperty(command="uname -a", property="uname"))
+ at end example
+
+This runs @code{uname -a} and captures its stdout, stripped of leading
+and trailing whitespace, in the property "uname".  To avoid stripping,
+add @code{strip=False}.  The @code{property} argument can be specified
+as a @code{WithProperties} object.
+
+The more advanced usage allows you to specify a function to extract
+properties from the command output.  Here you can use regular
+expressions, string interpolation, or whatever you would like.
+The function is called with three arguments: the exit status of the
+command, its standard output as a string, and its standard error as
+a string.  It should return a dictionary containing all new properties.
+
+ at example
+def glob2list(rc, stdout, stderr):
+    jpgs = [ l.strip() for l in stdout.split('\n') ]
+    return @{ 'jpgs' : jpgs @}
+f.addStep(SetProperty(command="ls -1 *.jpg", extract_fn=glob2list))
+ at end example
+
+Note that any ordering relationship of the contents of stdout and
+stderr is lost.  For example, given
+
+ at example
+f.addStep(SetProperty(
+    command="echo output1; echo error >&2; echo output2", 
+    extract_fn=my_extract))
+ at end example
+
+Then @code{my_extract} will see @code{stdout="output1\noutput2\n"}
+and @code{stderr="error\n"}.
+
+ at node Build Properties
 @subsubsection Build Properties
 
 @cindex build properties




From warner at users.sourceforge.net  Tue May 27 00:52:15 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:15 +0000
Subject: [Buildbot-commits] buildbot/buildbot/changes svnpoller.py,1.8,1.9
Message-ID: <E1K0nQF-0001Sy-Pp@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/changes
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11429/buildbot/changes

Modified Files:
	svnpoller.py 
Log Message:
[project @ #261:buildbot_branch_deletions.diff]
Patch by Neil Hemingway <neil.hemingway at googlemail.com> that has
svnpoller checking whether the change reported by SVN is a branch
deletion. If it is, a buildbot Change is not created.

Original author: dustin at v.igoro.us
Date: 2008-05-16 20:45:12+00:00

Index: svnpoller.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/svnpoller.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- svnpoller.py	29 Apr 2008 16:15:36 -0000	1.8
+++ svnpoller.py	27 May 2008 00:52:13 -0000	1.9
@@ -402,6 +402,7 @@
             branches = {}
             pathlist = el.getElementsByTagName("paths")[0]
             for p in pathlist.getElementsByTagName("path"):
+                action = p.getAttribute("action")
                 path = "".join([t.data for t in p.childNodes])
                 # the rest of buildbot is certaily not yet ready to handle
                 # unicode filenames, because they get put in RemoteCommands
@@ -411,21 +412,32 @@
                 if path.startswith("/"):
                     path = path[1:]
                 where = self._transform_path(path)
+
                 # if 'where' is None, the file was outside any project that
                 # we care about and we should ignore it
                 if where:
                     branch, filename = where
                     if not branch in branches:
-                        branches[branch] = []
-                    branches[branch].append(filename)
+                        branches[branch] = { 'files': []}
+                    branches[branch]['files'].append(filename)
 
-            for branch in branches:
-                c = Change(who=author,
-                           files=branches[branch],
-                           comments=comments,
-                           revision=revision,
-                           branch=branch)
-                changes.append(c)
+                    if not branches[branch].has_key('action'):
+                        branches[branch]['action'] = action
+
+            for branch in branches.keys():
+                action = branches[branch]['action']
+                files  = branches[branch]['files']
+                number_of_files_changed = len(files)
+
+                if action == u'D' and number_of_files_changed == 1 and files[0] == '':
+                    log.msg("Ignoring deletion of branch '%s'" % branch)
+                else:
+                    c = Change(who=author,
+                               files=files,
+                               comments=comments,
+                               revision=revision,
+                               branch=branch)
+                    changes.append(c)
 
         return changes
 




From warner at users.sourceforge.net  Tue May 27 00:52:15 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:15 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_svnpoller.py, 1.5,
	1.6
Message-ID: <E1K0nQF-0001T4-QR@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11429/buildbot/test

Modified Files:
	test_svnpoller.py 
Log Message:
[project @ #261:buildbot_branch_deletions.diff]
Patch by Neil Hemingway <neil.hemingway at googlemail.com> that has
svnpoller checking whether the change reported by SVN is a branch
deletion. If it is, a buildbot Change is not created.

Original author: dustin at v.igoro.us
Date: 2008-05-16 20:45:12+00:00

Index: test_svnpoller.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_svnpoller.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_svnpoller.py	30 Mar 2008 01:30:00 -0000	1.5
+++ test_svnpoller.py	27 May 2008 00:52:13 -0000	1.6
@@ -117,7 +117,33 @@
 # output from svn log on .../SVN-Repository/sample
 # (so it includes trunk and branches)
 sample_base = "file:///usr/home/warner/stuff/Projects/BuildBot/trees/misc/_trial_temp/test_vc/repositories/SVN-Repository/sample"
-sample_logentries = [None] * 4
+sample_logentries = [None] * 6
+
+sample_logentries[5] = """\
+<logentry
+   revision="6">
+<author>warner</author>
+<date>2006-10-01T19:35:16.165664Z</date>
+<paths>
+<path
+   action="D">/sample/branch/version.c</path>
+</paths>
+<msg>revised_to_2</msg>
+</logentry>
+"""
+
+sample_logentries[4] = """\
+<logentry
+   revision="5">
+<author>warner</author>
+<date>2006-10-01T19:35:16.165664Z</date>
+<paths>
+<path
+   action="D">/sample/branch</path>
+</paths>
+<msg>revised_to_2</msg>
+</logentry>
+"""
 
 sample_logentries[3] = """\
 <logentry
@@ -293,6 +319,27 @@
         self.failUnlessEqual(changes[0].revision, '4')
         self.failUnlessEqual(changes[0].files, ["version.c"])
 
+        # and now pull in r5 (should *not* create a change as it's a
+        # branch deletion
+        doc = s.parse_logs(make_changes_output(5))
+        newlast, logentries = s._filter_new_logentries(doc, newlast)
+        self.failUnlessEqual(newlast, 5)
+        # so we see revision 5 as being new
+        changes = s.create_changes(logentries)
+        self.failUnlessEqual(len(changes), 0)
+
+        # and now pull in r6 (should create a change as it's not
+        # deleting an entire branch
+        doc = s.parse_logs(make_changes_output(6))
+        newlast, logentries = s._filter_new_logentries(doc, newlast)
+        self.failUnlessEqual(newlast, 6)
+        # so we see revision 6 as being new
+        changes = s.create_changes(logentries)
+        self.failUnlessEqual(len(changes), 1)
+        self.failUnlessEqual(changes[0].branch, 'branch')
+        self.failUnlessEqual(changes[0].revision, '6')
+        self.failUnlessEqual(changes[0].files, ["version.c"])
+
     def testFirstTime(self):
         base = "file:///home/warner/stuff/Projects/BuildBot/trees/svnpoller/_trial_temp/test_vc/repositories/SVN-Repository/sample"
         s = SVNPoller(base, split_file=split_file)




From warner at users.sourceforge.net  Tue May 27 00:52:19 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:19 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_vc.py,1.88,1.89
Message-ID: <E1K0nQJ-0001U3-TS@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11449/buildbot/test

Modified Files:
	test_vc.py 
Log Message:
[project @ #281:make-user-info.patch]
Configure username and email in case the user running trial does not
have git config in their home directory.

Original author: dustin at v.igoro.us
Date: 2008-05-17 20:11:42+00:00

Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- test_vc.py	22 May 2008 22:12:57 -0000	1.88
+++ test_vc.py	27 May 2008 00:52:17 -0000	1.89
@@ -2565,6 +2565,10 @@
         yield w; w.getResult()
         w = self.dovc(tmp, ["add", "."])
         yield w; w.getResult()
+        w = self.dovc(tmp, ["config", "user.email", "buildbot-trial at localhost"])
+        yield w; w.getResult()
+        w = self.dovc(tmp, ["config", "user.name", "Buildbot Trial"])
+        yield w; w.getResult()
         w = self.dovc(tmp, ["commit", "-m", "initial_import"])
         yield w; w.getResult()
 




From warner at users.sourceforge.net  Tue May 27 00:52:23 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:23 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps shell.py,1.24,1.25
Message-ID: <E1K0nQN-0001Uf-P0@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11461/buildbot/steps

Modified Files:
	shell.py 
Log Message:
[project @ fix-setproperty-step.patch]
Fix the SetProperty step to use the new properties interface, which it missed
due to a reordering of patches.

Original author: dustin at v.igoro.us
Date: 2008-05-20 03:29:40+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- shell.py	26 May 2008 23:52:13 -0000	1.24
+++ shell.py	27 May 2008 00:52:21 -0000	1.25
@@ -244,8 +244,8 @@
         if self.property:
             result = cmd.logs['stdio'].getText()
             if self.strip: result = result.strip()
-            propname = render_properties(self.property, self.build)
-            self.setProperty(propname, result)
+            propname = self.build.getProperties().render(self.property)
+            self.setProperty(propname, result, "SetProperty Step")
             self.property_changes[propname] = result
         else:
             log = cmd.logs['stdio']
@@ -253,7 +253,7 @@
                     ''.join(log.getChunks([STDOUT], onlyText=True)),
                     ''.join(log.getChunks([STDERR], onlyText=True)))
             for k,v in new_props.items():
-                self.setProperty(k, v)
+                self.setProperty(k, v, "SetProperty Step")
             self.property_changes = new_props
 
     def createSummary(self, log):




From warner at users.sourceforge.net  Tue May 27 00:52:27 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:27 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_vc.py,1.89,1.90
Message-ID: <E1K0nQR-0001VY-Jv@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11473/buildbot/test

Modified Files:
	test_vc.py 
Log Message:
[project @ #281:fix-vc-tests.patch]
Fix VC tests to expect None instead of '' for unset properties, and
fix remaining two places where git repositories must have username
and email configured.

Original author: dustin at v.igoro.us
Date: 2008-05-20 04:01:27+00:00

Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- test_vc.py	27 May 2008 00:52:17 -0000	1.89
+++ test_vc.py	27 May 2008 00:52:25 -0000	1.90
@@ -541,8 +541,8 @@
         self.shouldExist(self.workdir, "subdir", "subdir.c")
         if self.metadir:
             self.shouldExist(self.workdir, self.metadir)
-        self.failUnlessEqual(bs.getProperty("revision"), '')
-        self.failUnlessEqual(bs.getProperty("branch"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), None)
+        self.failUnlessEqual(bs.getProperty("branch"), None)
         self.checkGotRevisionIsLatest(bs)
 
         self.touch(self.workdir, "newfile")
@@ -565,8 +565,8 @@
         self.shouldExist(self.workdir, "subdir", "subdir.c")
         if self.metadir:
             self.shouldExist(self.workdir, self.metadir)
-        self.failUnlessEqual(bs.getProperty("revision"), self.helper.trunk[0] or '')
-        self.failUnlessEqual(bs.getProperty("branch"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), self.helper.trunk[0] or None)
+        self.failUnlessEqual(bs.getProperty("branch"), None)
         self.checkGotRevision(bs, self.helper.trunk[0])
         # leave the tree at HEAD
         return self.doBuild()
@@ -585,7 +585,7 @@
                            "version=%d" % self.helper.version)
         if self.metadir:
             self.shouldExist(self.workdir, self.metadir)
-        self.failUnlessEqual(bs.getProperty("revision"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), None)
         self.checkGotRevisionIsLatest(bs)
 
         self.touch(self.workdir, "newfile")
@@ -609,7 +609,7 @@
         self.shouldContain(self.workdir, "version.c",
                            "version=%d" % self.helper.version)
         self.shouldExist(self.workdir, "newfile")
-        self.failUnlessEqual(bs.getProperty("revision"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), None)
         self.checkGotRevisionIsLatest(bs)
 
         # now "update" to an older revision
@@ -623,7 +623,7 @@
         self.shouldContain(self.workdir, "version.c",
                            "version=%d" % (self.helper.version-1))
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.trunk[-2] or '')
+                             self.helper.trunk[-2] or None)
         self.checkGotRevision(bs, self.helper.trunk[-2])
 
         # now update to the newer revision
@@ -637,7 +637,7 @@
         self.shouldContain(self.workdir, "version.c",
                            "version=%d" % self.helper.version)
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.trunk[-1] or '')
+                             self.helper.trunk[-1] or None)
         self.checkGotRevision(bs, self.helper.trunk[-1])
 
 
@@ -674,7 +674,7 @@
         self.shouldNotExist(self.workdir, "newfile")
         self.touch(self.workdir, "newfile")
         self.touch(self.vcdir, "newvcfile")
-        self.failUnlessEqual(bs.getProperty("revision"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), None)
         self.checkGotRevisionIsLatest(bs)
 
         d = self.doBuild() # copy rebuild clobbers new files
@@ -687,7 +687,7 @@
         self.shouldNotExist(self.workdir, "newfile")
         self.shouldExist(self.vcdir, "newvcfile")
         self.shouldExist(self.workdir, "newvcfile")
-        self.failUnlessEqual(bs.getProperty("revision"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), None)
         self.checkGotRevisionIsLatest(bs)
         self.touch(self.workdir, "newfile")
 
@@ -698,7 +698,7 @@
     def _do_vctest_export_1(self, bs):
         self.shouldNotExist(self.workdir, self.metadir)
         self.shouldNotExist(self.workdir, "newfile")
-        self.failUnlessEqual(bs.getProperty("revision"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), None)
         #self.checkGotRevisionIsLatest(bs)
         # VC 'export' is not required to have a got_revision
         self.touch(self.workdir, "newfile")
@@ -709,7 +709,7 @@
     def _do_vctest_export_2(self, bs):
         self.shouldNotExist(self.workdir, self.metadir)
         self.shouldNotExist(self.workdir, "newfile")
-        self.failUnlessEqual(bs.getProperty("revision"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), None)
         #self.checkGotRevisionIsLatest(bs)
         # VC 'export' is not required to have a got_revision
 
@@ -744,7 +744,7 @@
         data = open(subdir_c, "r").read()
         self.failUnlessIn("Hello patched subdir.\\n", data)
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.trunk[-1] or '')
+                             self.helper.trunk[-1] or None)
         self.checkGotRevision(bs, self.helper.trunk[-1])
 
         # make sure that a rebuild does not use the leftover patched workdir
@@ -758,7 +758,7 @@
                                 "subdir", "subdir.c")
         data = open(subdir_c, "r").read()
         self.failUnlessIn("Hello subdir.\\n", data)
-        self.failUnlessEqual(bs.getProperty("revision"), '')
+        self.failUnlessEqual(bs.getProperty("revision"), None)
         self.checkGotRevisionIsLatest(bs)
 
         # now make sure we can patch an older revision. We need at least two
@@ -783,7 +783,7 @@
         data = open(subdir_c, "r").read()
         self.failUnlessIn("Hello patched subdir.\\n", data)
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.trunk[-2] or '')
+                             self.helper.trunk[-2] or None)
         self.checkGotRevision(bs, self.helper.trunk[-2])
 
         # now check that we can patch a branch
@@ -802,8 +802,8 @@
         data = open(subdir_c, "r").read()
         self.failUnlessIn("Hello patched subdir.\\n", data)
         self.failUnlessEqual(bs.getProperty("revision"),
-                             self.helper.branch[-1] or '')
-        self.failUnlessEqual(bs.getProperty("branch"), self.helper.branchname or '')
+                             self.helper.branch[-1] or None)
+        self.failUnlessEqual(bs.getProperty("branch"), self.helper.branchname or None)
         self.checkGotRevision(bs, self.helper.branch[-1])
 
 
@@ -2596,6 +2596,10 @@
         log.msg("vc_revise" + self.gitrepo)
         w = self.dovc(self.repbase, ["clone", self.gitrepo, "gittmp"])
         yield w; w.getResult()
+        w = self.dovc(tmp, ["config", "user.email", "buildbot-trial at localhost"])
+        yield w; w.getResult()
+        w = self.dovc(tmp, ["config", "user.name", "Buildbot Trial"])
+        yield w; w.getResult()
 
         self.version += 1
         version_c = VERSION_C % self.version
@@ -2620,6 +2624,10 @@
 
         w = self.dovc(self.repbase, ["clone", self.gitrepo, workdir])
         yield w; w.getResult()
+        w = self.dovc(workdir, ["config", "user.email", "buildbot-trial at localhost"])
+        yield w; w.getResult()
+        w = self.dovc(workdir, ["config", "user.name", "Buildbot Trial"])
+        yield w; w.getResult()
 
         if branch is not None:
             w = self.dovc(workdir, ["checkout", "-b", branch,




From warner at users.sourceforge.net  Tue May 27 00:52:31 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:31 +0000
Subject: [Buildbot-commits] buildbot/buildbot/steps shell.py,1.25,1.26
Message-ID: <E1K0nQW-0001Wo-J1@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/steps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11485/buildbot/steps

Modified Files:
	shell.py 
Log Message:
[project @ #228:perl-module-tests.patch]
Patch by Neil Hemingway <nhemingway at googlemail.com> to add a PerlModuleTest step

Original author: dustin at v.igoro.us
Date: 2008-05-27 00:05:57+00:00

Index: shell.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/shell.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- shell.py	27 May 2008 00:52:21 -0000	1.25
+++ shell.py	27 May 2008 00:52:29 -0000	1.26
@@ -363,3 +363,56 @@
     descriptionDone = ["test"]
     command = ["make", "test"]
 
+class PerlModuleTest(Test):
+    command=["prove", "--lib", "lib", "-r", "t"]
+    total = 0
+
+    def evaluateCommand(self, cmd):
+        lines = self.getLog('stdio').readlines()
+
+        re_test_result = re.compile("^(All tests successful)|(\d+)/(\d+) subtests failed|Files=\d+, Tests=(\d+),")
+
+        mos = map(lambda line: re_test_result.search(line), lines)
+        test_result_lines = [mo.groups() for mo in mos if mo]
+
+        if not test_result_lines:
+            return cmd.rc
+
+        test_result_line = test_result_lines[0]
+
+        success = test_result_line[0]
+
+        if success:
+            failed = 0
+
+            test_totals_line = test_result_lines[1]
+            total_str = test_totals_line[3]
+
+            rc = SUCCESS
+        else:
+            failed_str = test_result_line[1]
+            failed = int(failed_str)
+
+            total_str = test_result_line[2]
+
+            rc = FAILURE
+
+        total = int(total_str)
+        passed = total - failed
+
+        self.total, self.failed, self.passed = total, failed, passed
+
+        self.setProperty('tests-total', total, "PerlModuleTest")
+        self.setProperty('tests-failed', failed, "PerlModuleTest")
+        self.setProperty('tests-passed', passed, "PerlModuleTest")
+
+        self.warnings = failed
+
+        return rc
+
+    def getText(self, cmd, results):
+        if self.total:
+            return [ "%d failed, %d passed" % (self.failed, self.passed) ]
+        else:
+            return [ "no results" ]
+




From warner at users.sourceforge.net  Tue May 27 00:52:31 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:31 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status/web waterfall.py, 1.29,
	1.30
Message-ID: <E1K0nQW-0001Wm-Hl@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11485/buildbot/status/web

Modified Files:
	waterfall.py 
Log Message:
[project @ #228:perl-module-tests.patch]
Patch by Neil Hemingway <nhemingway at googlemail.com> to add a PerlModuleTest step

Original author: dustin at v.igoro.us
Date: 2008-05-27 00:05:57+00:00

Index: waterfall.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/waterfall.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- waterfall.py	22 May 2008 22:11:25 -0000	1.29
+++ waterfall.py	27 May 2008 00:52:29 -0000	1.30
@@ -110,6 +110,8 @@
         number = b.getNumber()
         url = path_to_build(req, b)
         text = b.getText()
+        tests_failed = b.sumStepProperty('tests-failed')
+        if tests_failed: text.extend(["Failed tests: %d" % tests_failed])
         # TODO: maybe add logs?
         # TODO: add link to the per-build page at 'url'
         c = b.getColor()




From warner at users.sourceforge.net  Tue May 27 00:52:31 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:31 +0000
Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.149,1.150
Message-ID: <E1K0nQW-0000bs-JQ@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11485/docs

Modified Files:
	buildbot.texinfo 
Log Message:
[project @ #228:perl-module-tests.patch]
Patch by Neil Hemingway <nhemingway at googlemail.com> to add a PerlModuleTest step

Original author: dustin at v.igoro.us
Date: 2008-05-27 00:05:57+00:00

Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- buildbot.texinfo	26 May 2008 23:52:31 -0000	1.149
+++ buildbot.texinfo	27 May 2008 00:52:29 -0000	1.150
@@ -4927,6 +4927,7 @@
 * Compile::                     
 * Test::                        
 * TreeSize::                    
+* PerlModuleTest::
 * SetProperty::                    
 * Build Properties::            
 @end menu
@@ -4994,6 +4995,15 @@
 aka 'KiB' or 'kibibytes') on the step's status text, and sets a build
 property named 'tree-size-KiB' with the same value.
 
+ at node PerlModuleTest, Build Properties, TreeSize, Simple ShellCommand Subclasses
+ at subsubsection PerlModuleTest
+
+ at bsindex buildbot.steps.shell.PerlModuleTest
+
+This is a simple command that knows how to run tests of perl modules.
+It parses the output to determine the number of tests passed and
+failed and total number executed, saving the results for later query.
+
 @node SetProperty
 @subsubsection SetProperty
 




From warner at users.sourceforge.net  Tue May 27 00:52:31 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:31 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_steps.py,1.48,1.49
Message-ID: <E1K0nQW-0001Wt-Ja@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11485/buildbot/test

Modified Files:
	test_steps.py 
Log Message:
[project @ #228:perl-module-tests.patch]
Patch by Neil Hemingway <nhemingway at googlemail.com> to add a PerlModuleTest step

Original author: dustin at v.igoro.us
Date: 2008-05-27 00:05:57+00:00

Index: test_steps.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_steps.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- test_steps.py	22 May 2008 22:12:57 -0000	1.48
+++ test_steps.py	27 May 2008 00:52:29 -0000	1.49
@@ -639,3 +639,38 @@
                                  "treesize %d KiB" % kib)
         d.addCallback(_check)
         return d
+
+class PerlModuleTest(StepTester, unittest.TestCase):
+    def testAllTestsPassed(self):
+        self.masterbase = "Warnings.testAllTestsPassed"
+        step = self.makeStep(shell.PerlModuleTest)
+        output = \
+"""ok 1
+ok 2
+All tests successful
+Files=1, Tests=123, other stuff
+"""
+        log = step.addLog("stdio")
+        log.addStdout(output)
+        log.finish()
+        step.evaluateCommand(log)
+        self.failUnlessEqual(step.getProperty('tests-failed'), 0)
+        self.failUnlessEqual(step.getProperty('tests-total'), 123)
+        self.failUnlessEqual(step.getProperty('tests-passed'), 123)
+
+    def testFailures(self):
+        self.masterbase = "Warnings.testFailures"
+        step = self.makeStep(shell.PerlModuleTest)
+        output = \
+"""
+ok 1
+ok 2
+3/7 subtests failed
+"""
+        log = step.addLog("stdio")
+        log.addStdout(output)
+        log.finish()
+        step.evaluateCommand(log)
+        self.failUnlessEqual(step.getProperty('tests-failed'), 3)
+        self.failUnlessEqual(step.getProperty('tests-total'), 7)
+        self.failUnlessEqual(step.getProperty('tests-passed'), 4)




From warner at users.sourceforge.net  Tue May 27 00:52:31 2008
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 27 May 2008 00:52:31 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process factory.py,1.17,1.18
Message-ID: <E1K0nQW-0000bu-Jb@mail.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11485/buildbot/process

Modified Files:
	factory.py 
Log Message:
[project @ #228:perl-module-tests.patch]
Patch by Neil Hemingway <nhemingway at googlemail.com> to add a PerlModuleTest step

Original author: dustin at v.igoro.us
Date: 2008-05-27 00:05:57+00:00

Index: factory.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/factory.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- factory.py	12 Aug 2007 07:43:55 -0000	1.17
+++ factory.py	27 May 2008 00:52:29 -0000	1.18
@@ -4,7 +4,7 @@
 from buildbot.process.base import Build
 from buildbot.process.buildstep import BuildStep
 from buildbot.steps.source import CVS, SVN
-from buildbot.steps.shell import Configure, Compile, Test
+from buildbot.steps.shell import Configure, Compile, Test, PerlModuleTest
 
 # deprecated, use BuildFactory.addStep
 def s(steptype, **kwargs):
@@ -81,7 +81,7 @@
         BuildFactory.__init__(self, [source])
         self.addStep(Configure, command=[perl, "Makefile.PL"])
         self.addStep(Compile, command=["make"])
-        self.addStep(Test, command=["make", "test"])
+        self.addStep(PerlModuleTest, command=["make", "test"])
 
 class Distutils(BuildFactory):
     def __init__(self, source, python="python", test=None):