Ask Solem пре 13 година
родитељ
комит
ba7142ec82

+ 3 - 5
celery/backends/mongodb.py

@@ -146,11 +146,9 @@ class MongoBackend(BaseDictBackend):
         """Save the taskset result."""
         from pymongo.binary import Binary
 
-        meta = {
-            "_id": taskset_id,
-            "result": Binary(self.encode(result)),
-            "date_done": datetime.utcnow()
-        }
+        meta = {"_id": taskset_id,
+                "result": Binary(self.encode(result)),
+                "date_done": datetime.utcnow()}
 
         db = self._get_database()
         taskmeta_collection = db[self.mongodb_taskmeta_collection]

+ 1 - 1
celery/tests/config.py

@@ -35,7 +35,7 @@ CELERY_MONGODB_BACKEND_SETTINGS = {
     "port": os.environ.get("MONGO_PORT") or 27017,
     "database": os.environ.get("MONGO_DB") or "celery_unittests",
     "taskmeta_collection": os.environ.get("MONGO_TASKMETA_COLLECTION") or
-        "taskmeta_collection"
+        "taskmeta_collection",
 }
 if os.environ.get("MONGO_USER"):
     CELERY_MONGODB_BACKEND_SETTINGS["user"] = os.environ.get("MONGO_USER")

+ 2 - 1
celery/tests/test_app/__init__.py

@@ -230,13 +230,14 @@ class test_App(unittest.TestCase):
         assert conn.transport_cls == "memory"
 
         pub = self.app.amqp.TaskPublisher(conn, exchange="foo_exchange")
-        self.assertIn("foo_exchange", amqp._exchanges_declared)
+        self.assertNotIn("foo_exchange", amqp._exchanges_declared)
 
         dispatcher = Dispatcher()
         self.assertTrue(pub.delay_task("footask", (), {},
                                        exchange="moo_exchange",
                                        routing_key="moo_exchange",
                                        event_dispatcher=dispatcher))
+        self.assertIn("moo_exchange", amqp._exchanges_declared)
         self.assertTrue(dispatcher.sent)
         self.assertEqual(dispatcher.sent[0][0], "task-sent")
         self.assertTrue(pub.delay_task("footask", (), {},

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

@@ -17,7 +17,8 @@ _no_mongo_msg_emitted = False
 try:
     from pymongo.errors import AutoReconnect
 except ImportError:
-    class AutoReconnect(Exception):
+
+    class AutoReconnect(Exception):  # noqa
         pass
 
 

+ 1 - 0
celery/tests/test_concurrency/test_concurrency_processes.py

@@ -229,6 +229,7 @@ class test_TaskPool(unittest.TestCase):
         self.assertEqual(info["timeouts"], (5, 10))
 
     def test_restart(self):
+        raise SkipTest("functional test")
         def get_pids(pool):
             return set([p.pid for p in pool._pool._pool])