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

Cleaning up unit tests to call signal_start

Browse Source
This commit is contained in:
Matthew Jones
2014-03-12 17:01:23 -04:00
parent c0382f78bb
commit 99d42dc3fa
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,7 +414,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') 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') job = self.create_test_job(job_template=job_template, job_type='check')
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -471,7 +471,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'failed') self.check_job_result(job, 'failed')
@@ -499,7 +499,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') 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') job = self.create_test_job(job_template=job_template, job_type='check')
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
# Since we don't actually run the task, the --check should indicate # 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.assertEqual(job.cancel_flag, False)
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.build_args_callback = self._cancel_job_callback self.build_args_callback = self._cancel_job_callback
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'canceled') self.check_job_result(job, 'canceled')
@@ -676,7 +676,7 @@ class RunJobTest(BaseCeleryTest):
job.save() job.save()
self.assertEqual(job.celery_task, None) self.assertEqual(job.celery_task, None)
# Unable to start job again. # Unable to start job again.
self.assertFalse(job.start()) self.assertFalse(job.signal_start())
def test_extra_job_options(self): def test_extra_job_options(self):
self.create_test_project(TEST_PLAYBOOK) self.create_test_project(TEST_PLAYBOOK)
@@ -686,7 +686,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -697,7 +697,7 @@ class RunJobTest(BaseCeleryTest):
job_template2 = self.create_test_job_template(extra_vars='foo=1') job_template2 = self.create_test_job_template(extra_vars='foo=1')
job2 = self.create_test_job(job_template=job_template2) job2 = self.create_test_job(job_template=job_template2)
self.assertEqual(job2.status, 'new') self.assertEqual(job2.status, 'new')
self.assertTrue(job2.start()) self.assertTrue(job2.signal_start())
self.assertEqual(job2.status, 'waiting') self.assertEqual(job2.status, 'waiting')
job2 = Job.objects.get(pk=job2.pk) job2 = Job.objects.get(pk=job2.pk)
self.check_job_result(job2, 'successful') self.check_job_result(job2, 'successful')
@@ -705,7 +705,7 @@ class RunJobTest(BaseCeleryTest):
job_template3 = self.create_test_job_template(extra_vars='abc: 1234') job_template3 = self.create_test_job_template(extra_vars='abc: 1234')
job3 = self.create_test_job(job_template=job_template3) job3 = self.create_test_job(job_template=job_template3)
self.assertEqual(job3.status, 'new') self.assertEqual(job3.status, 'new')
self.assertTrue(job3.start()) self.assertTrue(job3.signal_start())
self.assertEqual(job3.status, 'waiting') self.assertEqual(job3.status, 'waiting')
job3 = Job.objects.get(pk=job3.pk) job3 = Job.objects.get(pk=job3.pk)
self.check_job_result(job3, 'successful') self.check_job_result(job3, 'successful')
@@ -717,7 +717,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.assertTrue(len(job.job_args) > 1024) self.assertTrue(len(job.job_args) > 1024)
@@ -730,7 +730,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'failed') self.check_job_result(job, 'failed')
@@ -743,7 +743,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -756,7 +756,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -771,9 +771,9 @@ class RunJobTest(BaseCeleryTest):
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertTrue(job.passwords_needed_to_start) self.assertTrue(job.passwords_needed_to_start)
self.assertTrue('ssh_password' in 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.assertEqual(job.status, 'new')
self.assertTrue(job.start(ssh_password='sshpass')) self.assertTrue(job.signal_start(ssh_password='sshpass'))
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -787,7 +787,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
# Job may fail if current user doesn't have password-less sudo # 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.assertEqual(job.status, 'new')
self.assertTrue(job.passwords_needed_to_start) self.assertTrue(job.passwords_needed_to_start)
self.assertTrue('sudo_password' in 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.assertEqual(job.status, 'new')
self.assertTrue(job.start(sudo_password='sudopass')) self.assertTrue(job.signal_start(sudo_password='sudopass'))
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
# Job may fail if current user doesn't have password-less sudo # 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) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -835,7 +835,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -850,7 +850,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'failed') self.check_job_result(job, 'failed')
@@ -866,9 +866,9 @@ class RunJobTest(BaseCeleryTest):
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertTrue(job.passwords_needed_to_start) self.assertTrue(job.passwords_needed_to_start)
self.assertTrue('ssh_key_unlock' in 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.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') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -892,7 +892,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -911,7 +911,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
@@ -939,7 +939,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'failed') self.check_job_result(job, 'failed')
@@ -967,7 +967,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'failed') self.check_job_result(job, 'failed')
@@ -996,7 +996,7 @@ class RunJobTest(BaseCeleryTest):
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting') self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')