External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 08:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix up some unit tests where we have slightly changed the meaning of cancel

Browse Source
This commit is contained in:
Matthew Jones
2014-09-08 11:23:23 -04:00
parent 68cbc7883c
commit 0c40ca36f6
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tests/jobs.py
View File

@@ -1020,7 +1020,7 @@ class JobStartCancelTest(BaseJobTestMixin, django.test.LiveServerTestCase):
job.save() job.save()
with self.current_user(self.user_sue): with self.current_user(self.user_sue):
response = self.get(url) response = self.get(url)
if status in ('pending', 'running'): if status in ('new', 'pending', 'waiting', 'running'):
self.assertTrue(response['can_cancel']) self.assertTrue(response['can_cancel'])
response = self.post(url, {}, expect=202) response = self.post(url, {}, expect=202)
else: else:

3
awx/main/tests/tasks.py
View File

@@ -778,9 +778,6 @@ class RunJobTest(BaseCeleryTest):
job.save() job.save()
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertEqual(job.cancel_flag, False) self.assertEqual(job.cancel_flag, False)
# Calling cancel before start has no effect.
self.assertFalse(job.cancel())
self.assertEqual(job.cancel_flag, False)
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
job.cancel_flag = True job.cancel_flag = True
job.save() job.save()