tests passing

celery/tests/utilities/test_encoding.py

@@ -15,17 +15,6 @@ class test_encoding(Case):
         self.assertTrue(encoding.safe_str('foo'))
         self.assertTrue(encoding.safe_str(u'foo'))
 
-    def test_safe_str_UnicodeDecodeError(self):
-        if sys.version_info >= (3, 0):
-            raise SkipTest('py3k: not relevant')
-
-        class foo(unicode):
-
-            def encode(self, *args, **kwargs):
-                raise UnicodeDecodeError('foo')
-
-        self.assertIn('<Unrepresentable', encoding.safe_str(foo()))
-
     def test_safe_repr(self):
         self.assertTrue(encoding.safe_repr(object()))
 

celery/tests/utilities/test_term.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
+from kombu.utils.encoding import str_t
+
 from celery.utils import term
 from celery.utils.term import colored, fg
 
@@ -38,7 +40,7 @@ class test_colored(Case):
         self.assertTrue(str(colored().iwhite('f')))
         self.assertTrue(str(colored().reset('f')))
 
-        self.assertTrue(str(colored().green(u'∂bar')))
+        self.assertTrue(str_t(colored().green(u'∂bar')))
 
         self.assertTrue(
             colored().red(u'éefoo') + colored().green(u'∂bar'))