Fixed compressing long strings with PY3

pekkaklarck · pekkaklarck · commit 7bae7fa9d661 · 2015-11-10T01:15:55.000+02:00
diff --git a/src/robot/reporting/stringcache.py b/src/robot/reporting/stringcache.py
@@ -41,7 +41,7 @@ def _encode(self, text):
             return raw
         compressed = compress_text(text)
         if len(compressed) * self._use_compressed_threshold < len(raw):
-            return str(compressed)
+            return compressed
         return raw
 
     def _raw(self, text):
diff --git a/src/robot/utils/compress.py b/src/robot/utils/compress.py
@@ -15,9 +15,12 @@
 import base64
 import sys
 
+from .platform import PY2
+
 
 def compress_text(text):
-    return base64.b64encode(_compress(text.encode('UTF-8')))
+    result = base64.b64encode(_compress(text.encode('UTF-8')))
+    return result if PY2 else result.decode('ASCII')
 
 
 if not sys.platform.startswith('java'):
diff --git a/utest/utils/test_compress.py b/utest/utils/test_compress.py
@@ -1,13 +1,14 @@
 import unittest
 import zlib
 
-from robot.utils.compress import _compress
-from robot.utils.asserts import assert_equals
+from robot.utils.compress import compress_text, _compress
+from robot.utils.asserts import assert_equals, assert_true
 
 
 class TestCompress(unittest.TestCase):
 
     def _test(self, text):
+        assert_true(isinstance(compress_text(text), str))
         text = text.encode('UTF-8')
         assert_equals(_compress(text), zlib.compress(text, 9))
 
@@ -21,3 +22,7 @@ def test_100_char_strings(self):
     def test_non_ascii(self):
         self._test(u'hyv\xe4')
         self._test(u'\u4e2d\u6587')
+
+
+if __name__ == '__main__':
+    unittest.main()
