Merge 160443d into ed375ba

master/buildbot/steps/shell.py

@@ -19,6 +19,7 @@
 from twisted.python import log, failure
 from twisted.spread import pb
 from buildbot.process import buildstep
+from buildbot.process.properties import Interpolate
 from buildbot.status.results import SUCCESS, WARNINGS, FAILURE
 from buildbot.status.logfile import STDOUT, STDERR
 from buildbot import config
@@ -200,6 +201,8 @@ def _describe(self, done=False):
             words = self.command
             if isinstance(words, (str, unicode)):
                 words = words.split()
+            elif isinstance(words, Interpolate):
+                return [str(words)]
 
             try:
                 len(words)

master/buildbot/test/unit/test_steps_shell.py

@@ -16,6 +16,7 @@
 import re
 import textwrap
 from twisted.trial import unittest
+from buildbot.process.properties import Interpolate
 from buildbot.steps import shell
 from buildbot.status.results import SKIPPED, SUCCESS, WARNINGS, FAILURE
 from buildbot.status.results import EXCEPTION
@@ -71,6 +72,11 @@ def test_constructor_args_validity(self):
                     lambda: shell.ShellCommand('build', "echo Hello World",
                             wrongArg1=1, wrongArg2='two'))
 
+    def test_describe_with_command_Interpolate(self):
+        command = Interpolate("echo 'test %s'", 'one fish')
+        step = shell.ShellCommand(command=command)
+        self.assertEqual(step.describe(), [str(command)])
+
     def test_describe_no_command(self):
         step = shell.ShellCommand(workdir='build')
         self.assertEqual((step.describe(), step.describe(done=True)),