External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 11:25:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update JobHostSummary.__str__ and corresponding tests

Browse Source
This commit is contained in:
Jim Ladd
2019-02-22 23:00:27 -08:00
parent c6227797b4
commit cc1a97b6d8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/jobs.py
View File

@@ -1133,9 +1133,9 @@ class JobHostSummary(CreatedModifiedModel):
def __str__(self): def __str__(self):
host = getattr_dne(self, 'host') host = getattr_dne(self, 'host')
hostname = host.name if host else 'N/A' hostname = host.name if host else 'N/A'
return '%s changed=%d dark=%d failures=%d ok=%d processed=%d skipped=%s' % \ return '%s changed=%d dark=%d failures=%d ignored=%d ok=%d processed=%d rescued=%d skipped=%s' % \
(hostname, self.changed, self.dark, self.failures, self.ok, (hostname, self.changed, self.dark, self.failures, self.ignored, self.ok,
self.processed, self.skipped) self.processed, self.rescued, self.skipped)
def get_absolute_url(self, request=None): def get_absolute_url(self, request=None):
return reverse('api:job_host_summary_detail', kwargs={'pk': self.pk}, request=request) return reverse('api:job_host_summary_detail', kwargs={'pk': self.pk}, request=request)

6
awx/main/tests/functional/models/test_job.py
View File

@@ -68,14 +68,14 @@ def test_job_host_summary_representation(host):
job = Job.objects.create(name='foo') job = Job.objects.create(name='foo')
jhs = JobHostSummary.objects.create( jhs = JobHostSummary.objects.create(
host=host, job=job, host=host, job=job,
changed=1, dark=2, failures=3, ok=4, processed=5, skipped=6 changed=1, dark=2, failures=3, ignored=4, ok=5, processed=6, rescued=7, skipped=8
) )
assert 'single-host changed=1 dark=2 failures=3 ok=4 processed=5 skipped=6' == str(jhs) assert 'single-host changed=1 dark=2 failures=3 ignored=4 ok=5 processed=6 rescued=7 skipped=8' == str(jhs)
# Representation should be robust to deleted related items # Representation should be robust to deleted related items
jhs = JobHostSummary.objects.get(pk=jhs.id) jhs = JobHostSummary.objects.get(pk=jhs.id)
host.delete() host.delete()
assert 'N/A changed=1 dark=2 failures=3 ok=4 processed=5 skipped=6' == str(jhs) assert 'N/A changed=1 dark=2 failures=3 ignored=4 ok=5 processed=6 rescued=7 skipped=8' == str(jhs)
@pytest.mark.django_db @pytest.mark.django_db