From 28c9d77f2948e9091755954f0ae772b77fcf17b2 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Fri, 14 Mar 2014 15:54:27 -0400 Subject: [PATCH] Fix some bugs found from unit tests --- awx/main/models/jobs.py | 2 +- awx/main/tests/tasks.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 55516ea5dc..a2357fcd04 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -34,7 +34,7 @@ from jsonfield import JSONField # AWX from awx.main.models.base import * -from awx.main.utils import encrypt_field +from awx.main.utils import encrypt_field, decrypt_field # Celery from celery import chain diff --git a/awx/main/tests/tasks.py b/awx/main/tests/tasks.py index 3bbc4c7843..3cef95ef57 100644 --- a/awx/main/tests/tasks.py +++ b/awx/main/tests/tasks.py @@ -836,6 +836,9 @@ class RunJobTest(BaseCeleryTest): self.assertTrue(job.passwords_needed_to_start) self.assertTrue('ssh_key_unlock' in job.passwords_needed_to_start) self.assertFalse(job.signal_start()) + job.status = 'failed' + job.save() + job = self.create_test_job(job_template=job_template) self.assertEqual(job.status, 'new') self.assertTrue(job.signal_start(ssh_key_unlock=TEST_SSH_KEY_DATA_UNLOCK)) job = Job.objects.get(pk=job.pk)