Merge from Subversion

* Better report formatting
(This used to be commit e7eafa10da828b4dc46a05a99164eb8ac37563df)

diff --git a/source3/stf/comfychair.py b/source3/stf/comfychair.py
index b552baccd20241e3ccd2dc5fc54851d711bcd335..d7e23efc10f15acae7a67a517361bd495effc0d6 100644 (file)
--- a/source3/stf/comfychair.py
+++ b/source3/stf/comfychair.py
@@ -170,7 +170,7 @@ Output:
             # Either we could not execute the command or the command
             # returned exit code 127.  According to system(3) we can't
             # tell the difference.
-            raise NotRunError, "could not execute %s" % cmd
+            raise NotRunError, "could not execute %s" % `cmd`
         return rc, output
 
     def explain_failure(self, exc_info = None):
@@ -213,7 +213,7 @@ def runtests(test_list, verbose = 0):
     import traceback
     ret = 0
     for test_class in test_list:
-        print "%-60s" % _test_name(test_class),
+        print "%-30s" % _test_name(test_class),
         # flush now so that long running tests are easier to follow
         sys.stdout.flush()