summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/common.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/testsuite/common.py b/testsuite/common.py
index 536b11cbd..7471795a6 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -223,8 +223,11 @@ class Bcfg2TestCase(unittest.TestCase):
lines = ['First has %d, Second has %d: %r' % diff
for diff in differences]
diffMsg = '\n'.join(lines)
- standardMsg = self._truncateMessage(standardMsg, diffMsg)
- msg = self._formatMessage(msg, standardMsg)
+ standardMsg += diffMsg
+ if msg is None:
+ msg = standardMsg
+ else:
+ msg = "%s : %s" % (standardMsg, msg)
self.fail(msg)
if not hasattr(unittest.TestCase, "assertRegexpMatches"):