External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-09 12:09:20 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3192 from wwitzel3/test-refactoring

Browse Source 
Update some tests and refactor some code.
This commit is contained in:
Wayne Witzel III
2016-08-04 11:17:42 -04:00
committed by GitHub
parent 3850b96da2 c5b005fd35
commit f30292c7f1
4 changed files with 63 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/api/views.py
View File

@@ -2966,21 +2966,7 @@ class JobJobTasksList(BaseJobEventsList):
return ({'detail': 'Parent event not found.'}, -1, status.HTTP_404_NOT_FOUND)
parent_task = parent_task[0]
# Some events correspond to a playbook or task starting up,
# and these are what we're interested in here.
STARTING_EVENTS = ('playbook_on_task_start', 'playbook_on_setup')
# We need to pull information about each start event.
#
# This is super tricky, because this table has a one-to-many
# relationship with itself (parent-child), and we're getting
# information for an arbitrary number of children. This means we
# need stats on grandchildren, sorted by child.
queryset = (JobEvent.objects.filter(parent__parent=parent_task,
parent__event__in=STARTING_EVENTS)
.values('parent__id', 'event', 'changed')
.annotate(num=Count('event'))
.order_by('parent__id'))
queryset = JobEvent.start_event_queryset(parent_task)
# The data above will come back in a list, but we are going to
# want to access it based on the parent id, so map it into a