better debugging messages

djmitche · Jun 13, 2010 · 29f8105 · 29f8105
1 parent 9be91f5
commit 29f8105
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/slave/buildslave/test/fake/runprocess.py b/slave/buildslave/test/fake/runprocess.py
@@ -91,16 +91,17 @@ def __init__(self, builder, command, workdir, **kwargs):
                     if key in default_values:
                         if default_values[key] == kwargs[key]:
                             continue # default values are expected
-                        msg.append('%s: expected default (%r), got %r' %
+                        msg.append('%s: expected default (%r),\n  got %r' %
                                     (key, default_values[key], kwargs[key]))
                     else:
                         msg.append('%s: unexpected arg, value = %r' % (key, kwargs[key]))
                 elif key not in kwargs:
                     msg.append('%s: did not get expected arg' % (key,))
                 elif exp.kwargs[key] != kwargs[key]:
-                    msg.append('%s: expected %r, got %r' % (key, exp.kwargs[key], kwargs[key]))
+                    msg.append('%s: expected %r,\n  got %r' % (key, exp.kwargs[key], kwargs[key]))
             if msg:
-                msg.insert(0, 'did not get expected __init__ arguments:')
+                msg.insert(0, 'did not get expected __init__ arguments for\n '
+                              + " ".join(kwargs.get('command', ['unknown command'])))
                 self._expectations[:] = [] # don't expect any more instances, since we're failing
                 raise AssertionError("\n".join(msg))