From 28257779f4b8df2942709281c0483d9c5fc285a6 Mon Sep 17 00:00:00 2001
From: "Jens W. Klein" <jk@kleinundpartner.at>
Date: Wed, 20 Jan 2016 13:59:57 +0100
Subject: [PATCH 1/2] test readability

---
 .../PortalTransforms/tests/test_transforms.py | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Products/PortalTransforms/tests/test_transforms.py b/Products/PortalTransforms/tests/test_transforms.py
index d1c331d..160d2ef 100644
--- a/Products/PortalTransforms/tests/test_transforms.py
+++ b/Products/PortalTransforms/tests/test_transforms.py
@@ -68,13 +68,27 @@ def do_convert(self, filename=None):
 
         got_start = got.strip()[:20]
         expected_start = expected.strip()[:20]
-        self.assertEqual(got_start, expected_start,
-                         '[%s]\n\n!=\n\n[%s]\n\nIN %s(%s)' % (
-                             got_start, expected_start, self.transform.name(), self.input))
-        self.assertEqual(self.subobjects, len(res_data.getSubObjects()),
-                         '%s\n\n!=\n\n%s\n\nIN %s(%s)' % (
-            self.subobjects, len(res_data.getSubObjects()),
-            self.transform.name(), self.input))
+        start = '[%s]\n\n!=\n\n[%s]\n\nIN %s(%s)' % (
+            got_start,
+            expected_start,
+            self.transform.name(),
+            self.input
+        )
+        self.assertEqual(
+            got_start,
+            expected_start,
+            start
+        )
+        self.assertEqual(
+            self.subobjects,
+            len(res_data.getSubObjects()),
+            '%s\n\n!=\n\n%s\n\nIN %s(%s)' % (
+                self.subobjects,
+                len(res_data.getSubObjects()),
+                self.transform.name(),
+                self.input
+            )
+        )
 
     def testSame(self):
         try:

From 71d85c872eb22421d9f5a7ed8e08c420e78a5e3a Mon Sep 17 00:00:00 2001
From: "Jens W. Klein" <jk@kleinundpartner.at>
Date: Wed, 20 Jan 2016 14:32:15 +0100
Subject: [PATCH 2/2] Fix output of TransformTest to not contain binary in case
 of failure.

---
 CHANGES.rst                                        |  4 ++++
 Products/PortalTransforms/tests/test_transforms.py | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index e1cd916..230c122 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,10 @@ New:
 
 Fixes:
 
+- Fix output of TransformTest to not contain binary in case of failure. This
+  broke the test result parser.
+  [jensens]
+
 - cleanup: autopep8, isort sorted imports, utf8 header, security decorators,
   zca decorators, minor manual edits
   [jensens]
diff --git a/Products/PortalTransforms/tests/test_transforms.py b/Products/PortalTransforms/tests/test_transforms.py
index 160d2ef..9939e5c 100644
--- a/Products/PortalTransforms/tests/test_transforms.py
+++ b/Products/PortalTransforms/tests/test_transforms.py
@@ -68,16 +68,16 @@ def do_convert(self, filename=None):
 
         got_start = got.strip()[:20]
         expected_start = expected.strip()[:20]
-        start = '[%s]\n\n!=\n\n[%s]\n\nIN %s(%s)' % (
-            got_start,
-            expected_start,
+        msg = 'IN {0}({1}) expected:\n{2}\nbut got:\n{3}'.format(
             self.transform.name(),
-            self.input
+            self.input,
+            str([ord(x) for x in expected_start]),
+            str([ord(x) for x in got_start]),
         )
         self.assertEqual(
             got_start,
             expected_start,
-            start
+            msg
         )
         self.assertEqual(
             self.subobjects,