From 0c40ca36f69929aa5c2e3d87ff450f4543b9ec87 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 8 Sep 2014 11:23:23 -0400 Subject: [PATCH] Fix up some unit tests where we have slightly changed the meaning of cancel --- awx/main/tests/jobs.py | 2 +- awx/main/tests/tasks.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/awx/main/tests/jobs.py b/awx/main/tests/jobs.py index a1aaa1fe5f..a7d6f83a52 100644 --- a/awx/main/tests/jobs.py +++ b/awx/main/tests/jobs.py @@ -1020,7 +1020,7 @@ class JobStartCancelTest(BaseJobTestMixin, django.test.LiveServerTestCase): job.save() with self.current_user(self.user_sue): response = self.get(url) - if status in ('pending', 'running'): + if status in ('new', 'pending', 'waiting', 'running'): self.assertTrue(response['can_cancel']) response = self.post(url, {}, expect=202) else: diff --git a/awx/main/tests/tasks.py b/awx/main/tests/tasks.py index 73331f0648..91dcb2d8c3 100644 --- a/awx/main/tests/tasks.py +++ b/awx/main/tests/tasks.py @@ -778,9 +778,6 @@ class RunJobTest(BaseCeleryTest): job.save() self.assertEqual(job.status, 'new') 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) job.cancel_flag = True job.save()