CDSK-953 - resolve Interpolate in ShellCommand._describe

master/buildbot/steps/shell.py

@@ -199,10 +199,10 @@ def _describe(self, done=False):
                 return ["???"]
 
             words = self.command
+            if isinstance(words, Interpolate):
+                words = words.getRenderingFor(self.build).result
             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

@@ -22,6 +22,7 @@
 from buildbot.status.results import EXCEPTION
 from buildbot.test.util import steps, compat
 from buildbot.test.util import config as configmixin
+from buildbot.test.fake.fakebuild import FakeBuild
 from buildbot.test.fake.remotecommand import ExpectShell, Expect
 from buildbot.test.fake.remotecommand import ExpectRemoteRef
 from buildbot import config
@@ -73,9 +74,17 @@ def test_constructor_args_validity(self):
                             wrongArg1=1, wrongArg2='two'))
 
     def test_describe_with_command_Interpolate(self):
-        command = Interpolate("echo 'test %s'", 'one fish')
+        bash_command = "sleep %d"
+        bash_command_arg = 60
+        expected_output = ["'sleep", "60'"]
+        build = FakeBuild()
+
+        command = Interpolate(bash_command, bash_command_arg)
         step = shell.ShellCommand(command=command)
-        self.assertEqual(step.describe(), [str(command)])
+        step.build = build
+        output = step.describe()
+
+        self.assertEqual(expected_output, output)
 
     def test_describe_no_command(self):
         step = shell.ShellCommand(workdir='build')