External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-03 17:51:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

revert change of including slice wfj ids in recent_jobs list

Browse Source
This commit is contained in:
AlanCoding
2018-10-17 15:26:34 -04:00
parent 37f9024940
commit affacb8ab5
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/serializers.py
View File

@@ -2976,9 +2976,12 @@ class JobTemplateMixin(object):
''' '''
def _recent_jobs(self, obj): def _recent_jobs(self, obj):
job_mgr = obj.unifiedjob_unified_jobs.non_polymorphic().only('id', 'status', 'finished') if hasattr(obj, 'workflow_jobs'):
job_mgr = obj.workflow_jobs
else:
job_mgr = obj.jobs
return [{'id': x.id, 'status': x.status, 'finished': x.finished} return [{'id': x.id, 'status': x.status, 'finished': x.finished}
for x in job_mgr.order_by('-created')[:10]] for x in job_mgr.all().order_by('-created')[:10]]
def get_summary_fields(self, obj): def get_summary_fields(self, obj):
d = super(JobTemplateMixin, self).get_summary_fields(obj) d = super(JobTemplateMixin, self).get_summary_fields(obj)

2
awx/main/tests/functional/api/test_job.py
View File

@@ -132,7 +132,7 @@ def test_slice_jt_recent_jobs(slice_job_factory, admin_user, get):
expect=200 expect=200
) )
job_ids = [entry['id'] for entry in r.data['summary_fields']['recent_jobs']] job_ids = [entry['id'] for entry in r.data['summary_fields']['recent_jobs']]
assert workflow_job.pk in job_ids assert workflow_job.pk not in job_ids
for node in workflow_job.workflow_nodes.all(): for node in workflow_job.workflow_nodes.all():
job = node.job job = node.job
assert job.pk in job_ids assert job.pk in job_ids

13
awx/main/tests/unit/api/serializers/test_job_template_serializers.py
View File

@@ -71,19 +71,14 @@ class TestJobTemplateSerializerGetRelated():
class TestJobTemplateSerializerGetSummaryFields(): class TestJobTemplateSerializerGetSummaryFields():
def test__recent_jobs(self, mocker, job_template, jobs): def test__recent_jobs(self, mocker, job_template, jobs):
job_template.unifiedjob_unified_jobs = mocker.MagicMock(**{ job_template.jobs.all = mocker.MagicMock(**{'order_by.return_value': jobs})
'non_polymorphic.return_value': mocker.MagicMock(**{ job_template.jobs.all.return_value = job_template.jobs.all
'only.return_value': mocker.MagicMock(**{
'order_by.return_value': jobs
})
})
})
serializer = JobTemplateSerializer() serializer = JobTemplateSerializer()
recent_jobs = serializer._recent_jobs(job_template) recent_jobs = serializer._recent_jobs(job_template)
job_template.unifiedjob_unified_jobs.non_polymorphic.assert_called_once_with() job_template.jobs.all.assert_called_once_with()
job_template.unifiedjob_unified_jobs.non_polymorphic().only().order_by.assert_called_once_with('-created') job_template.jobs.all.order_by.assert_called_once_with('-created')
assert len(recent_jobs) == 10 assert len(recent_jobs) == 10
for x in jobs[:10]: for x in jobs[:10]:
assert recent_jobs == [{'id': x.id, 'status': x.status, 'finished': x.finished} for x in jobs[:10]] assert recent_jobs == [{'id': x.id, 'status': x.status, 'finished': x.finished} for x in jobs[:10]]