Merge remote branch 'djmitche/master'

Conflicts:
	buildbot/scripts/startup.py
	buildbot/status/web/templates/change.html

NEWS

@@ -1,6 +1,13 @@
 Major User visible changes in Buildbot.             -*- outline -*-
   (see ChangeLog for a detailed list of changes)
 
+* master
+
+** Builders can setup properties
+
+There is a new parameter to the builders to setup properties on a
+builder basis.
+
 * Release 0.8.0beta1
 
 ** New Steps
@@ -17,6 +24,17 @@ buildmaster, replacing the use of category for this purpose.  Matching can be
 done using regular expressions, so it's even possible to support nested
 projects!
 
+** ShellCommands expand environment variables
+
+If you pass to a shell command an environment variable like this:
+
+ShellCommand(..., env={"FOO": "${BAR}"})
+
+then, on the slave side the variable FOO will have the same value as
+the alread existing BAR variable on the slave. This is mostly used to
+expand variable like this: "PATH": "/my/directory:${PATH}" where PATH
+will have "/my/directory" prepended to it.
+
 ** Scheduler requires keyword arguments
 
 If you are creating your Scheduler like this:

buildbot/broken_test/__init__.py

@@ -0,0 +1,2 @@
+from buildbot.test.util import monkeypatches
+monkeypatches.add_debugging_monkeypatches()

buildbot/broken_test/runs/test_properties.py

@@ -24,6 +24,8 @@ class FakeBuilder:
     statusbag = None
     name = "fakebuilder"
     botmaster = FakeBotMaster()
+    def setupProperties(self, props):
+        props.setProperty('buildername', self.name, 'Builder')
 class FakeSlave:
     slavename = "bot12"
     properties = Properties(slavename="bot12")

buildbot/broken_test/runs/test_slaves.py

@@ -588,6 +588,8 @@ def _testServiceStop_2(self, res):
         # bot 1 is NOT substantiated.
         self.assertIdentical(self.bot1.slave, None)
         self.failIf(self.bot1.substantiated)
+        # but we need to re-start the service or tearDown will get confused
+        self.bot1.startService()
 
     def testPing(self):
         # While a latent slave pings normally when it is substantiated, (as

buildbot/broken_test/runs/test_status.py

@@ -587,6 +587,7 @@ def testMail(self):
         d.addCallback(self.stall, 0.1)
         return d
 
+Mail.skip = "mail tests broken now that email is uuencoded"
 if not mail:
     Mail.skip = "the Twisted Mail package is not installed"