From 9a83b7b25a2aa8fe48e291d6918cacb99750ac5a Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 5 Dec 2013 15:22:52 -0500
Subject: testsuite: fixed local implementation of assertItemsEqual

---
 testsuite/common.py | 7 +++++--
 1 file 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"):
-- 
cgit v1.2.3-1-g7c22