Skip to content

Commit 8611c31

Browse files
committed
Allow setting task name in run_task(), add Task.last_child property
1 parent dfdc324 commit 8611c31

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

spockbot/plugins/core/taskmanager.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ def __init__(self, ploader, settings):
1010
super(TaskManager, self).__init__(ploader, settings)
1111
ploader.provides('TaskManager', self)
1212

13-
def run_task(self, task, parent=None):
13+
def run_task(self, task, parent=None, name=None):
1414
if not isinstance(task, Task):
15-
task = Task(task, parent)
15+
task = Task(task, parent, name)
16+
if parent:
17+
parent.last_child = task
1618
task.run(self)
1719
return task

spockbot/plugins/tools/task.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ def __init__(self, task, parent=None, name=None):
9999
self.name = name or task.__name__
100100
self.task = task
101101
self.parent = parent
102+
self.last_child = None
102103
self.expected = {} # event -> check
103104

104105
@property
@@ -178,4 +179,4 @@ def parse_response(self, response):
178179
else: # unexpected
179180
self.expected.clear()
180181
raise ValueError('Illegal task yield argument of type %s: %s'
181-
% type(response), response)
182+
% (type(response), response))

0 commit comments

Comments
 (0)