Allow Properties(default=..) to contain further properties

buildbot · Nov 24, 2011 · 5472889 · 5472889
1 parent a35433e
commit 5472889
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/master/buildbot/process/properties.py b/master/buildbot/process/properties.py
@@ -312,10 +312,14 @@ def __init__(self, key, default=None, defaultWhenFalse=True):
 
     def getRenderingFor(self, props):
         if self.defaultWhenFalse:
-            return props.getProperty(self.key) or self.default
+            rv = props.getProperty(self.key)
+            if rv:
+                return rv
         else:
-            return props.getProperty(self.key, default=self.default)
+            if props.hasProperty(self.key):
+                return props.getProperty(self.key)
 
+        return props.render(self.default)
 
 class _DefaultRenderer:
     """

diff --git a/master/buildbot/test/unit/test_process_properties.py b/master/buildbot/test/unit/test_process_properties.py
@@ -561,6 +561,14 @@ def testDefaultValue(self):
         self.failUnlessEqual(self.build.render(value),
                 "Hello!")
 
+    def testDefaultValueNested(self):
+        self.props.setProperty("xxx", 'yyy', "scheduler")
+        value = Property("do-tests",
+                default=WithProperties("a-%(xxx)s-b"))
+
+        self.failUnlessEqual(self.build.render(value),
+                "a-yyy-b")
+
     def testIgnoreDefaultValue(self):
         self.props.setProperty("do-tests", "string", "scheduler")
         value = Property("do-tests", default="Hello!")

diff --git a/master/docs/manual/cfg-properties.rst b/master/docs/manual/cfg-properties.rst
@@ -180,6 +180,10 @@ parameter is not set::
    f.addStep(ShellCommand(command=[ 'echo', 'warnings:',
                     Property('warnings', default='none', defaultWhenFalse=False) ])
 
+The default value can reference other properties, e.g., ::
+
+    command=Property('command', default=Property('default-command'))
+
 .. Index:: single; Properties; WithProperties
 
 .. _WithProperties:

diff --git a/master/docs/release-notes.rst b/master/docs/release-notes.rst
@@ -39,6 +39,11 @@ Features
 * The master-side SVN step now has an `export` method which is similar to
   `copy`, but the build directory does not contain Subversion metdata. (:bb:bug:`2078`)
 
+* :py:class:`Property` instances will now render any properties in the
+  default value if necessary.  This makes possible constructs like ::
+
+    command=Property('command', default=Property('default-command'))
+
 Slave
 -----