Add support for parsing TaskStatus objects to the TaskResult object

fixes #1011
pulp · Jun 4, 2015 · 499dc63 · 499dc63
1 parent efc4579
commit 499dc63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/server/pulp/server/async/tasks.py b/server/pulp/server/async/tasks.py
@@ -232,6 +232,8 @@ def __init__(self, result=None, error=None, spawned_tasks=None):
                     self.spawned_tasks.append({'task_id': spawned_task.get('task_id')})
                 elif isinstance(spawned_task, AsyncResult):
                     self.spawned_tasks.append({'task_id': spawned_task.id})
+                elif isinstance(spawned_task, TaskStatus):
+                    self.spawned_tasks.append({'task_id': spawned_task.task_id})
                 else:  # This should be a string
                     self.spawned_tasks.append({'task_id': spawned_task})
 

diff --git a/server/test/unit/server/async/test_tasks.py b/server/test/unit/server/async/test_tasks.py
@@ -277,13 +277,16 @@ def test_serialize(self):
 
         async_result = AsyncResult('foo')
         test_exception = PulpException('foo')
-        result = tasks.TaskResult('foo', test_exception, [{'task_id': 'baz'}, async_result, "qux"])
+        task_status = TaskStatus(task_id='quux')
+        result = tasks.TaskResult('foo', test_exception, [{'task_id': 'baz'},
+                                                          async_result, "qux", task_status])
         serialized = result.serialize()
         self.assertEquals(serialized.get('result'), 'foo')
         compare_dict(test_exception.to_dict(), serialized.get('error'))
         self.assertEquals(serialized.get('spawned_tasks'), [{'task_id': 'baz'},
                                                             {'task_id': 'foo'},
-                                                            {'task_id': 'qux'}])
+                                                            {'task_id': 'qux'},
+                                                            {'task_id': 'quux'}])
 
 
 class TestReservedTaskMixinApplyAsyncWithReservation(ResourceReservationTests):