Ask Solem 12 years ago
parent
commit
c3c5c7f776

+ 4 - 2
celery/tests/backends/test_amqp.py

@@ -212,8 +212,10 @@ class test_AMQPBackend(AppCase):
             results.queue.clear()
             assert not results.qsize()
             backend._cache[tid] = 'hello'
-            self.assertEqual(backend.get_task_meta(tid), 'hello',
-                            'Returns cache if no new states')
+            self.assertEqual(
+                backend.get_task_meta(tid), 'hello',
+                'Returns cache if no new states',
+            )
 
     def test_wait_for(self):
         b = self.create_backend()

+ 0 - 2
celery/tests/backends/test_base.py

@@ -7,8 +7,6 @@ from contextlib import contextmanager
 from mock import Mock, patch
 from nose import SkipTest
 
-from billiard.einfo import Traceback
-
 from celery import current_app
 from celery.exceptions import ChordError
 from celery.five import items, range

+ 1 - 1
celery/tests/backends/test_cache.py

@@ -38,7 +38,7 @@ class test_CacheBackend(AppCase):
         )
         try:
             with self.assertRaises(ImproperlyConfigured):
-                tb = CacheBackend(backend=None, app=self.app)
+                CacheBackend(backend=None, app=self.app)
         finally:
             self.app.conf.CELERY_CACHE_BACKEND = prev
 

+ 0 - 3
celery/tests/backends/test_rpc.py

@@ -2,9 +2,7 @@ from __future__ import absolute_import
 
 from mock import patch
 
-from celery import states
 from celery.backends.rpc import RPCBackend
-from celery.utils import uuid
 from celery._state import _task_stack
 
 from celery.tests.utils import AppCase, Mock
@@ -75,4 +73,3 @@ class test_RPCBackend(AppCase):
         self.assertEqual(ex.delivery_mode, 1)
         self.assertFalse(ex.durable)
         self.assertFalse(ex.auto_delete)
-

+ 2 - 0
celery/tests/bin/proj/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from celery import Celery
 
 hello = Celery(set_as_current=False)

+ 2 - 0
celery/tests/bin/proj/app.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from celery import Celery
 
 app = Celery(set_as_current=False)

+ 0 - 1
celery/tests/bin/test_beat.py

@@ -79,7 +79,6 @@ class test_Beat(AppCase):
         self.assertTrue(app.log.setup.called)
         self.assertEqual(app.log.setup.call_args[1]['colorize'], False)
 
-
     def test_init_loader(self):
         b = beatapp.Beat()
         b.init_loader()

+ 0 - 2
celery/tests/bin/test_celery.py

@@ -222,7 +222,6 @@ class test_result(AppCase):
                 self.assertIn(str(tb), out.getvalue())
 
 
-
 class test_status(AppCase):
 
     @patch('celery.bin.celery.inspect')
@@ -402,7 +401,6 @@ class test_main(AppCase):
         mainfun()
         command.execute_from_commandline.assert_called_with(None)
 
-
     @patch('celery.bin.celery.CeleryCommand')
     def test_main_KeyboardInterrupt(self, Command):
         command = Command.return_value = Mock()

+ 0 - 1
celery/tests/concurrency/test_processes.py

@@ -330,4 +330,3 @@ class test_TaskPool(PoolCase):
         tp.restart()
         time.sleep(0.5)
         self.assertEqual(pids, get_pids(tp))
-

+ 1 - 1
celery/tests/tasks/test_canvas.py

@@ -163,7 +163,7 @@ class test_xmap_xstarmap(AppCase):
 
             s.apply_async(foo=1)
             s.type.apply_async.assert_called_with(
-                    (), {'task': add.s(), 'it': args}, foo=1,
+                (), {'task': add.s(), 'it': args}, foo=1,
             )
 
             self.assertEqual(type.from_dict(dict(s)), s)

+ 1 - 3
celery/tests/worker/test_bootsteps.py

@@ -121,7 +121,7 @@ class test_ConsumerStep(AppCase):
 
     def test_start_stop_shutdown(self):
         consumer = Mock()
-        conn = self.connection = Mock()
+        self.connection = Mock()
 
         class Step(bootsteps.ConsumerStep):
 
@@ -151,8 +151,6 @@ class test_ConsumerStep(AppCase):
         step.start(self)
 
 
-
-
 class test_StartStopStep(Case):
 
     class Def(bootsteps.StartStopStep):