Tests passing

celery/tests/backends/test_base.py

@@ -98,12 +98,14 @@ class test_prepare_exception(AppCase):
         self.b = BaseBackend(self.app)
 
     def test_unpickleable(self):
+        self.b.serializer = 'pickle'
         x = self.b.prepare_exception(Unpickleable(1, 2, 'foo'))
         self.assertIsInstance(x, KeyError)
         y = self.b.exception_to_python(x)
         self.assertIsInstance(y, KeyError)
 
     def test_impossible(self):
+        self.b.serializer = 'pickle'
         x = self.b.prepare_exception(Impossible())
         self.assertIsInstance(x, UnpickleableExceptionWrapper)
         self.assertTrue(str(x))
@@ -115,6 +117,7 @@ class test_prepare_exception(AppCase):
             self.assertEqual(y.__class__.__module__, 'foo.module')
 
     def test_regular(self):
+        self.b.serializer = 'pickle'
         x = self.b.prepare_exception(KeyError('baz'))
         self.assertIsInstance(x, KeyError)
         y = self.b.exception_to_python(x)

celery/tests/backends/test_cache.py

@@ -31,6 +31,7 @@ class SomeClass(object):
 class test_CacheBackend(AppCase):
 
     def setup(self):
+        self.app.conf.CELERY_RESULT_SERIALIZER = 'pickle'
         self.tb = CacheBackend(backend='memory://', app=self.app)
         self.tid = uuid()
 

celery/tests/backends/test_database.py

@@ -40,6 +40,7 @@ class test_DatabaseBackend(AppCase):
         if DatabaseBackend is None:
             raise SkipTest('sqlalchemy not installed')
         self.uri = 'sqlite:///test.db'
+        self.app.conf.CELERY_RESULT_SERIALIZER = 'pickle'
 
     def test_retry_helper(self):
         from celery.backends.database import DatabaseError

celery/tests/case.py

@@ -93,6 +93,7 @@ CELERY_TEST_CONFIG = {
     'CELERY_QUEUES': (
         Queue('testcelery', routing_key='testcelery'),
     ),
+    'CELERY_ACCEPT_CONTENT': ('json', 'pickle'),
     'CELERY_ENABLE_UTC': True,
     'CELERY_TIMEZONE': 'UTC',
     'CELERYD_LOG_COLOR': False,

celery/tests/tasks/test_result.py

@@ -44,6 +44,7 @@ def make_mock_group(app, size=10):
 class test_AsyncResult(AppCase):
 
     def setup(self):
+        self.app.conf.CELERY_RESULT_SERIALIZER = 'pickle'
         self.task1 = mock_task('task1', states.SUCCESS, 'the')
         self.task2 = mock_task('task2', states.SUCCESS, 'quick')
         self.task3 = mock_task('task3', states.FAILURE, KeyError('brown'))
@@ -614,6 +615,7 @@ class test_pending_AsyncResult(AppCase):
 class test_failed_AsyncResult(test_GroupResult):
 
     def setup(self):
+        self.app.conf.CELERY_RESULT_SERIALIZER = 'pickle'
         self.size = 11
         subtasks = make_mock_group(self.app, 10)
         failed = mock_task('ts11', states.FAILURE, KeyError('Baz'))

celery/tests/tasks/test_tasks.py

@@ -235,7 +235,7 @@ class test_tasks(TasksCase):
 
     def assertNextTaskDataEqual(self, consumer, presult, task_name,
                                 test_eta=False, test_expires=False, **kwargs):
-        next_task = consumer.queues[0].get(accept=['pickle'])
+        next_task = consumer.queues[0].get(accept=['pickle', 'json'])
         task_data = next_task.decode()
         self.assertEqual(task_data['id'], presult.id)
         self.assertEqual(task_data['task'], task_name)

celery/tests/worker/test_request.py

@@ -210,6 +210,7 @@ class MockEventDispatcher(object):
 class test_Request(AppCase):
 
     def setup(self):
+        self.app.conf.CELERY_RESULT_SERIALIZER = 'pickle'
 
         @self.app.task(shared=False)
         def add(x, y, **kw_):
@@ -807,6 +808,7 @@ class test_Request(AppCase):
             kwargs={},
         )
         self.assertIsInstance(job.execute(), ExceptionInfo)
+        assert self.mytask_raising.backend.serializer == 'pickle'
         meta = self.mytask_raising.backend.get_task_meta(tid)
         self.assertEqual(meta['status'], states.FAILURE)
         self.assertIsInstance(meta['result'], KeyError)