Ask Solem 16 years ago
parent
commit
02bf7a586c

+ 2 - 1
celery/tests/test_backends/test_base.py

@@ -4,6 +4,7 @@ from celery.backends.base import BaseBackend, KeyValueStoreBackend
 from celery.backends.base import UnpickleableExceptionWrapper
 from django.db.models.base import subclass_exception
 
+
 class wrapobject(object):
 
     def __init__(self, *args, **kwargs):
@@ -64,7 +65,7 @@ class TestKeyValueStoreBackendInterface(unittest.TestCase):
     def test_get(self):
         self.assertRaises(NotImplementedError, KeyValueStoreBackend().get,
                 "a")
-    
+
     def test_set(self):
         self.assertRaises(NotImplementedError, KeyValueStoreBackend().set,
                 "a", 1)

+ 1 - 1
celery/tests/test_celery.py

@@ -1,6 +1,7 @@
 import unittest
 import celery
 
+
 class TestInitFile(unittest.TestCase):
 
     def test_version(self):
@@ -14,7 +15,6 @@ class TestInitFile(unittest.TestCase):
         self.assertTrue(celery.is_stable_release())
         self.assertTrue("(stable)" in celery.version_with_meta())
 
-
     def test_meta(self):
         for m in ("__author__", "__contact__", "__homepage__",
                 "__docformat__"):

+ 2 - 3
celery/tests/test_monitoring.py

@@ -23,7 +23,6 @@ class TestStatisticsInterface(unittest.TestCase):
 
 class TestTaskTimerStats(unittest.TestCase):
 
-
     def test_time(self):
         self.assertTimeElapsed(0.5, 1, 0, "0.5")
         self.assertTimeElapsed(0.002, 0.05, 0, "0.0")
@@ -54,7 +53,7 @@ class TestTaskTimerStats(unittest.TestCase):
 
 
 class TestStatsCollector(unittest.TestCase):
-    
+
     def setUp(self):
         conn = DjangoAMQPConnection()
         consumer = StatsConsumer(connection=conn)
@@ -84,7 +83,7 @@ class TestStatsCollector(unittest.TestCase):
         # Collect
         self.s.collect()
         self.assertEquals(self.s.total_tasks_processed, 3)
-      
+
         # Report
         import sys
         from StringIO import StringIO

+ 3 - 4
celery/tests/test_task.py

@@ -70,7 +70,7 @@ class TestCeleryTasks(unittest.TestCase):
         self.assertTrue(res, sum([operator.add(x, x)
                                     for x in xrange(10)]))
         conf.ALWAYS_EAGER = False
-    
+
     def test_dmap_async(self):
         from celery import conf
         import operator
@@ -127,7 +127,7 @@ class TestCeleryTasks(unittest.TestCase):
         presult2 = task.delay_task(t1.name, name="George Constanza")
         self.assertNextTaskDataEquals(consumer, presult2, t1.name,
                 name="George Constanza")
-        
+
         # With eta.
         presult2 = task.apply_async(t1, kwargs=dict(name="George Constanza"),
                                     eta=datetime.now() + timedelta(days=1))
@@ -171,7 +171,7 @@ class TestTaskSet(unittest.TestCase):
 
     def test_function_taskset(self):
         from celery import conf
-        conf.ALWAYS_EAGER = True 
+        conf.ALWAYS_EAGER = True
         ts = task.TaskSet("cu.return-true", [
             [[1], {}], [[2], {}], [[3], {}], [[4], {}], [[5], {}]])
         res = ts.run()
@@ -243,4 +243,3 @@ class TestPeriodicTask(unittest.TestCase):
             run_every = None
 
         self.assertRaises(NotImplementedError, MyPeriodicTask)
-

+ 5 - 6
celery/tests/test_worker.py

@@ -26,7 +26,7 @@ class MockLogger(object):
 
     def error(self, *args, **kwargs):
         pass
-    
+
     def debug(self, *args, **kwargs):
         pass
 
@@ -39,7 +39,7 @@ class MockBackend(object):
 
 
 class MockPool(object):
-    
+
     def __init__(self, *args, **kwargs):
         self.raise_regular = kwargs.get("raise_regular", False)
         self.raise_base = kwargs.get("raise_base", False)
@@ -71,6 +71,7 @@ class MockController(object):
     def stop(self):
         self._stopped = True
 
+
 def create_message(backend, **data):
     data["id"] = gen_unique_id()
     return BaseMessage(backend, body=pickle.dumps(dict(**data)),
@@ -78,7 +79,6 @@ def create_message(backend, **data):
                        content_encoding="binary")
 
 
-
 class TestAMQPListener(unittest.TestCase):
 
     def setUp(self):
@@ -120,7 +120,7 @@ class TestAMQPListener(unittest.TestCase):
         self.assertEquals(in_bucket.task_name, "c.u.foo")
         self.assertEquals(in_bucket.execute(), 2 * 4 * 8)
         self.assertRaises(Empty, self.hold_queue.get_nowait)
-    
+
     def test_receieve_message_not_registered(self):
         l = AMQPListener(self.bucket_queue, self.hold_queue, self.logger)
         backend = MockBackend()
@@ -130,7 +130,6 @@ class TestAMQPListener(unittest.TestCase):
         self.assertRaises(Empty, self.bucket_queue.get_nowait)
         self.assertRaises(Empty, self.hold_queue.get_nowait)
 
-    
     def test_receieve_message_eta(self):
         l = AMQPListener(self.bucket_queue, self.hold_queue, self.logger)
         backend = MockBackend()
@@ -175,7 +174,7 @@ class TestWorkController(unittest.TestCase):
         task = TaskWrapper.from_message(m, m.decode())
         worker.safe_process_task(task)
         worker.pool.stop()
-    
+
     def test_safe_process_task_raise_base(self):
         worker = self.worker
         worker.pool = MockPool(raise_base=True)

+ 1 - 1
celery/worker/__init__.py

@@ -73,7 +73,7 @@ class AMQPListener(object):
         except NotRegistered, exc:
             self.logger.info("Unknown task ignored: %s" % (exc))
             return
-                
+
         eta = message_data.get("eta")
         if eta:
             self.hold_queue.put((task, eta))