Merge branch 'bug2122' of git://github.com/tomprince/buildbot

* 'bug2122' of git://github.com/tomprince/buildbot: ShellCommand.describe(): Ignore AttributeError Conflicts: master/buildbot/steps/shell.py
buildbot · Jan 20, 2012 · d4cedf8 · d4cedf8
2 parents d254746 + e92aec4
commit d4cedf8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/master/buildbot/steps/shell.py b/master/buildbot/steps/shell.py
@@ -179,6 +179,12 @@ def describe(self, done=False):
             if isinstance(words, (str, unicode)):
                 words = words.split()
 
+            try:
+                len(words)
+            except AttributeError:
+                # WithProperties and Property don't have __len__
+                return ["???"]
+
             tmp = []
             for x in words:
                 if isinstance(x, (str, unicode)):

diff --git a/master/buildbot/test/unit/test_steps_shell.py b/master/buildbot/test/unit/test_steps_shell.py
@@ -23,6 +23,7 @@
 from buildbot.test.fake.remotecommand import ExpectShell, Expect
 from buildbot.test.fake.remotecommand import ExpectRemoteRef
 from buildbot import config
+from buildbot.process import properties
 
 class TestShellCommandExecution(steps.BuildStepMixin, unittest.TestCase):
 
@@ -128,6 +129,11 @@ def test_describe_custom(self):
         self.assertEqual((step.describe(), step.describe(done=True)),
                          (['echoing'], ['echoed']))
 
+    def test_describe_unrendered_WithProperties(self):
+        step = shell.ShellCommand(command=properties.WithProperties(''))
+        self.assertEqual((step.describe(), step.describe(done=True)),
+                         (['???'],)*2)
+
     @compat.usesFlushLoggedErrors
     def test_describe_fail(self):
         step = shell.ShellCommand(command=object())