mirror of
https://github.com/ansible/awx.git
synced 2026-01-13 11:00:03 -03:30
Cleaning up unit tests to call signal_start
This commit is contained in:
Matthew Jones
parent
c0382f78bb
commit
99d42dc3fa
@ -414,7 +414,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -443,7 +443,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template, job_type='check')
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -471,7 +471,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'failed')
|
||||
@ -499,7 +499,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -622,7 +622,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template, job_type='check')
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
# Since we don't actually run the task, the --check should indicate
|
||||
@ -663,7 +663,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
self.assertEqual(job.cancel_flag, False)
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.build_args_callback = self._cancel_job_callback
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'canceled')
|
||||
@ -676,7 +676,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job.save()
|
||||
self.assertEqual(job.celery_task, None)
|
||||
# Unable to start job again.
|
||||
self.assertFalse(job.start())
|
||||
self.assertFalse(job.signal_start())
|
||||
|
||||
def test_extra_job_options(self):
|
||||
self.create_test_project(TEST_PLAYBOOK)
|
||||
@ -686,7 +686,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -697,7 +697,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job_template2 = self.create_test_job_template(extra_vars='foo=1')
|
||||
job2 = self.create_test_job(job_template=job_template2)
|
||||
self.assertEqual(job2.status, 'new')
|
||||
self.assertTrue(job2.start())
|
||||
self.assertTrue(job2.signal_start())
|
||||
self.assertEqual(job2.status, 'waiting')
|
||||
job2 = Job.objects.get(pk=job2.pk)
|
||||
self.check_job_result(job2, 'successful')
|
||||
@ -705,7 +705,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job_template3 = self.create_test_job_template(extra_vars='abc: 1234')
|
||||
job3 = self.create_test_job(job_template=job_template3)
|
||||
self.assertEqual(job3.status, 'new')
|
||||
self.assertTrue(job3.start())
|
||||
self.assertTrue(job3.signal_start())
|
||||
self.assertEqual(job3.status, 'waiting')
|
||||
job3 = Job.objects.get(pk=job3.pk)
|
||||
self.check_job_result(job3, 'successful')
|
||||
@ -717,7 +717,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.assertTrue(len(job.job_args) > 1024)
|
||||
@ -730,7 +730,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'failed')
|
||||
@ -743,7 +743,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -756,7 +756,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -771,9 +771,9 @@ class RunJobTest(BaseCeleryTest):
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertTrue(job.passwords_needed_to_start)
|
||||
self.assertTrue('ssh_password' in job.passwords_needed_to_start)
|
||||
self.assertFalse(job.start())
|
||||
self.assertFalse(job.signal_start())
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertTrue(job.start(ssh_password='sshpass'))
|
||||
self.assertTrue(job.signal_start(ssh_password='sshpass'))
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -787,7 +787,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
# Job may fail if current user doesn't have password-less sudo
|
||||
@ -804,9 +804,9 @@ class RunJobTest(BaseCeleryTest):
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertTrue(job.passwords_needed_to_start)
|
||||
self.assertTrue('sudo_password' in job.passwords_needed_to_start)
|
||||
self.assertFalse(job.start())
|
||||
self.assertFalse(job.signal_start())
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertTrue(job.start(sudo_password='sudopass'))
|
||||
self.assertTrue(job.signal_start(sudo_password='sudopass'))
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
# Job may fail if current user doesn't have password-less sudo
|
||||
@ -821,7 +821,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -835,7 +835,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -850,7 +850,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'failed')
|
||||
@ -866,9 +866,9 @@ class RunJobTest(BaseCeleryTest):
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertTrue(job.passwords_needed_to_start)
|
||||
self.assertTrue('ssh_key_unlock' in job.passwords_needed_to_start)
|
||||
self.assertFalse(job.start())
|
||||
self.assertFalse(job.signal_start())
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertTrue(job.start(ssh_key_unlock=TEST_SSH_KEY_DATA_UNLOCK))
|
||||
self.assertTrue(job.signal_start(ssh_key_unlock=TEST_SSH_KEY_DATA_UNLOCK))
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -892,7 +892,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -911,7 +911,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
@ -939,7 +939,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'failed')
|
||||
@ -967,7 +967,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'failed')
|
||||
@ -996,7 +996,7 @@ class RunJobTest(BaseCeleryTest):
|
||||
job = self.create_test_job(job_template=job_template)
|
||||
self.assertEqual(job.status, 'new')
|
||||
self.assertFalse(job.passwords_needed_to_start)
|
||||
self.assertTrue(job.start())
|
||||
self.assertTrue(job.signal_start())
|
||||
self.assertEqual(job.status, 'waiting')
|
||||
job = Job.objects.get(pk=job.pk)
|
||||
self.check_job_result(job, 'successful')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user