zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-17 07:48:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

AC-1040 Unified jobs updates to get unit tests to pass (hopefully).

Browse Source
This commit is contained in:
Chris Church
2014-03-20 19:16:58 -04:00
parent 0ee5c07738
commit 691942cac3
16 changed files with 519 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/tests/base.py
+10 -1
View File
@@ -374,7 +374,16 @@ class BaseTestMixin(object):
self.check_list_ids(response, qs, check_order)
if fields:
for obj in response['results']:
self.assertTrue(set(obj.keys()) <= set(fields))
returned_fields = set(obj.keys())
expected_fields = set(fields)
msg = ''
not_expected = returned_fields - expected_fields
if not_expected:
msg += 'fields %s not expected ' % ', '.join(not_expected)
not_returned = expected_fields - returned_fields
if not_returned:
msg += 'fields %s not returned ' % ', '.join(not_returned)
self.assertTrue(set(obj.keys()) <= set(fields), msg)
def start_taskmanager(self, command_port):
self.taskmanager_process = Process(target=run_taskmanager,
awx/main/tests/jobs.py
+1 -1
View File
@@ -456,7 +456,7 @@ class BaseJobTestMixin(BaseTestMixin):
class JobTemplateTest(BaseJobTestMixin, django.test.TestCase):
JOB_TEMPLATE_FIELDS = ('id', 'url', 'related', 'summary_fields', 'created',
JOB_TEMPLATE_FIELDS = ('id', 'type', 'url', 'related', 'summary_fields', 'created',
'modified', 'name', 'description', 'job_type',
'inventory', 'project', 'playbook', 'credential',
'cloud_credential', 'forks', 'limit', 'verbosity',
awx/main/tests/projects.py
+2 -2
View File
@@ -1610,7 +1610,7 @@ class ProjectUpdatesTest(BaseTransactionTest):
self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start())
self.assertEqual(job.status, 'pending')
self.assertTrue(job.status in ('pending', 'waiting'), job.status)
job = Job.objects.get(pk=job.pk)
self.assertTrue(job.status in ('successful', 'failed'),
job.result_stdout + job.result_traceback)
@@ -1624,7 +1624,7 @@ class ProjectUpdatesTest(BaseTransactionTest):
self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start())
self.assertEqual(job.status, 'pending')
self.assertTrue(job.status in ('pending', 'waiting'), job.status)
job = Job.objects.get(pk=job.pk)
# FIXME: Not quite sure why the project update still returns successful
# in this case?