From fe4b4043db1074dc2321cfe55a2dc91bd37016a8 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 13 Mar 2014 10:56:15 -0400 Subject: [PATCH] Changes to tasks unit tests --- awx/main/tests/tasks.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/awx/main/tests/tasks.py b/awx/main/tests/tasks.py index 1733626043..424d5cfa62 100644 --- a/awx/main/tests/tasks.py +++ b/awx/main/tests/tasks.py @@ -415,7 +415,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.check_job_events(job, 'ok', 1, 2) @@ -444,7 +443,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.check_job_events(job, 'skipped', 1, 2) @@ -472,7 +470,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'failed') self.check_job_events(job, 'failed', 1, 1) @@ -500,7 +497,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.check_job_events(job, 'ok', 1, 1, check_ignore_errors=True) @@ -623,7 +619,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_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 # everything is successful. @@ -687,7 +682,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.assertTrue('--forks=3' in self.run_job_args) @@ -698,7 +692,6 @@ class RunJobTest(BaseCeleryTest): job2 = self.create_test_job(job_template=job_template2) self.assertEqual(job2.status, 'new') self.assertTrue(job2.signal_start()) - self.assertEqual(job2.status, 'waiting') job2 = Job.objects.get(pk=job2.pk) self.check_job_result(job2, 'successful') # Test with extra_vars as YAML (should be converted to JSON in args). @@ -706,7 +699,6 @@ class RunJobTest(BaseCeleryTest): job3 = self.create_test_job(job_template=job_template3) self.assertEqual(job3.status, 'new') self.assertTrue(job3.signal_start()) - self.assertEqual(job3.status, 'waiting') job3 = Job.objects.get(pk=job3.pk) self.check_job_result(job3, 'successful') @@ -718,7 +710,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_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) self.check_job_result(job, 'successful') @@ -731,7 +722,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'failed') self.assertTrue('-l' in self.run_job_args) @@ -744,7 +734,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.assertTrue('ssh-agent' in self.run_job_args) @@ -757,7 +746,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.assertTrue('-u' in self.run_job_args) @@ -774,7 +762,6 @@ class RunJobTest(BaseCeleryTest): self.assertFalse(job.signal_start()) self.assertEqual(job.status, 'new') 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') self.assertTrue('--ask-pass' in self.run_job_args) @@ -788,7 +775,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_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 # privileges, but we're mainly checking the command line arguments. @@ -805,9 +791,7 @@ class RunJobTest(BaseCeleryTest): self.assertTrue(job.passwords_needed_to_start) self.assertTrue('sudo_password' in job.passwords_needed_to_start) self.assertFalse(job.signal_start()) - self.assertEqual(job.status, 'new') 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 # privileges, but we're mainly checking the command line arguments. @@ -822,7 +806,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.assertTrue('ssh-agent' in self.run_job_args) @@ -836,7 +819,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.assertTrue('ssh-agent' in self.run_job_args) @@ -851,7 +833,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'failed') self.assertTrue('ssh-agent' in self.run_job_args) @@ -869,7 +850,6 @@ class RunJobTest(BaseCeleryTest): self.assertFalse(job.signal_start()) self.assertEqual(job.status, 'new') 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') self.assertTrue('ssh-agent' in self.run_job_args) @@ -893,7 +873,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.assertTrue(env_var1 in job.job_env) @@ -912,7 +891,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.check_job_events(job, 'ok', 1, 1, async=True) @@ -940,7 +918,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'failed') self.check_job_events(job, 'failed', 1, 1, async=True) @@ -968,7 +945,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'failed') self.check_job_events(job, 'failed', 1, 1, async=True, @@ -997,7 +973,6 @@ class RunJobTest(BaseCeleryTest): self.assertEqual(job.status, 'new') self.assertFalse(job.passwords_needed_to_start) self.assertTrue(job.signal_start()) - self.assertEqual(job.status, 'waiting') job = Job.objects.get(pk=job.pk) self.check_job_result(job, 'successful') self.check_job_events(job, 'ok', 1, 1, async=True, async_nowait=True)