Tests passing again.

celery/tests/test_backends/test_database.py

@@ -56,7 +56,7 @@ class TestDatabaseBackend(unittest.TestCase):
         self.assertTrue(isinstance(b.get_result(tid3), KeyError))
 
     def test_taskset_store(self):
-        b = Backend()
+        b = DatabaseBackend()
         tid = gen_unique_id()
 
         self.assertTrue(b.get_taskset(tid) is None)

celery/tests/test_task.py

@@ -273,9 +273,9 @@ class TestCeleryTasks(unittest.TestCase):
                 name="George Constanza", test_eta=True)
 
         # Discarding all tasks.
-        task.discard_all()
+        consumer.discard_all()
         task.apply_async(t1)
-        self.assertEquals(task.discard_all(), 1)
+        self.assertEquals(consumer.discard_all(), 1)
         self.assertTrue(consumer.fetch() is None)
 
         self.assertFalse(presult.successful())
@@ -340,6 +340,7 @@ class TestTaskSet(unittest.TestCase):
         taskset_id = taskset_res.taskset_id
         for subtask in subtasks:
             m = consumer.fetch().payload
+            print("M: %s" % m)
             self.assertEquals(m.get("taskset"), taskset_id)
             self.assertEquals(m.get("task"), IncrementCounterTask.name)
             self.assertEquals(m.get("id"), subtask.task_id)

celery/tests/test_views.py

@@ -58,8 +58,8 @@ class TestTaskApply(ViewTestCase):
     def test_apply(self):
         conf.ALWAYS_EAGER = True
         try:
-            ret = self.client.get(task_apply(kwargs={"task_name": mytask.name,
-                                                     "args": "4/4"}))
+            ret = self.client.get(task_apply(kwargs={"task_name":
+                mytask.name}) + "?x=4&y=4")
             self.assertEquals(scratch["result"], 16)
         finally:
             conf.ALWAYS_EAGER = False
@@ -69,8 +69,7 @@ class TestTaskApply(ViewTestCase):
         try:
             name = "xxx.does.not.exist"
             action = curry(self.client.get, task_apply(kwargs={
-                                                        "task_name": name,
-                                                        "args": "4/4"}))
+                        "task_name": name}) + "?x=4&y=4")
             self.assertRaises(TemplateDoesNotExist, action)
         finally:
             conf.ALWAYS_EAGER = False

celery/views.py

@@ -43,8 +43,9 @@ def apply(request, task_name):
     without ensuring your code is safe!
 
     """
-    task = tasks[task_name]
-    if task_name not in tasks:
+    try:
+        task = tasks[task_name]
+    except KeyError:
         raise Http404("apply: no such task")
     return task_view(task)(request)
 

testproj/urls.py

@@ -16,8 +16,7 @@ urlpatterns = patterns('',
 
     # Uncomment the next line to enable the admin:
     # (r'^admin/(.*)', admin.site.root),
-    url(r"^apply/(?P<task_name>.+?)/(?P<args>.+)", apply,
-        name="celery-apply"),
+    url(r"^apply/(?P<task_name>.+?)/", apply, name="celery-apply"),
     url(r"^celery/", include("celery.urls")),
 
 )