Browse Source

TaskSet: Fixed a bug with using tuples in the argument list. Thanks to Harel Malka.

Ask Solem 15 years ago
parent
commit
1cd610b759
2 changed files with 11 additions and 11 deletions
  1. 10 10
      celery/tests/test_task.py
  2. 1 1
      celery/utils/__init__.py

+ 10 - 10
celery/tests/test_task.py

@@ -337,7 +337,7 @@ class TestTaskSet(unittest.TestCase):
         from celery import conf
         conf.ALWAYS_EAGER = True
         ts = task.TaskSet(return_True_task.name, [
-            [[1], {}], [[2], {}], [[3], {}], [[4], {}], [[5], {}]])
+            ([1], {}), [[2], {}], [[3], {}], [[4], {}], [[5], {}]])
         res = ts.apply_async()
         self.assertListEqual(res.join(), [True, True, True, True, True])
 
@@ -346,15 +346,15 @@ class TestTaskSet(unittest.TestCase):
     def test_counter_taskset(self):
         IncrementCounterTask.count = 0
         ts = task.TaskSet(IncrementCounterTask, [
-            [[], {}],
-            [[], {"increment_by": 2}],
-            [[], {"increment_by": 3}],
-            [[], {"increment_by": 4}],
-            [[], {"increment_by": 5}],
-            [[], {"increment_by": 6}],
-            [[], {"increment_by": 7}],
-            [[], {"increment_by": 8}],
-            [[], {"increment_by": 9}],
+            ([], {}),
+            ([], {"increment_by": 2}),
+            ([], {"increment_by": 3}),
+            ([], {"increment_by": 4}),
+            ([], {"increment_by": 5}),
+            ([], {"increment_by": 6}),
+            ([], {"increment_by": 7}),
+            ([], {"increment_by": 8}),
+            ([], {"increment_by": 9}),
         ])
         self.assertEqual(ts.task_name, IncrementCounterTask.name)
         self.assertEqual(ts.total, 9)

+ 1 - 1
celery/utils/__init__.py

@@ -76,7 +76,7 @@ def padlist(container, size, default=None):
         ("George", "Constanza", "NYC", "Earth")
 
     """
-    return container[:size] + [default] * (size - len(container))
+    return list(container)[:size] + [default] * (size - len(container))
 
 
 def mitemgetter(*items):