External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixes AC-402. Fix issues arising from unit tests.

Browse Source
This commit is contained in:
Chris Church
2013-09-05 07:57:44 -04:00
parent 567aef5d1e
commit 2e03a646a5
7 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/__init__.py
View File

@@ -692,7 +692,8 @@ class Project(CommonModel):
@property @property
def can_update(self): def can_update(self):
return bool(self.scm_type and not self.current_update) # FIXME: Prevent update when another one is active!
return bool(self.scm_type)# and not self.current_update)
def update(self, **kwargs): def update(self, **kwargs):
if self.can_update: if self.can_update:

3
awx/main/serializers.py
View File

@@ -227,7 +227,6 @@ class ProjectSerializer(BaseSerializer):
def validate_local_path(self, attrs, source): def validate_local_path(self, attrs, source):
# Don't allow assigning a local_path used by another project. # Don't allow assigning a local_path used by another project.
# Don't allow assigning a local_path when scm_type is set. # Don't allow assigning a local_path when scm_type is set.
print attrs, source, self.object
valid_local_paths = Project.get_local_path_choices() valid_local_paths = Project.get_local_path_choices()
if self.object: if self.object:
scm_type = attrs.get('scm_type', self.object.scm_type) scm_type = attrs.get('scm_type', self.object.scm_type)
@@ -542,7 +541,7 @@ class JobTemplateSerializer(BaseSerializer):
class JobSerializer(BaseSerializer): class JobSerializer(BaseSerializer):
passwords_needed_to_start = serializers.Field(source='get_passwords_needed_to_start') passwords_needed_to_start = serializers.Field(source='passwords_needed_to_start')
class Meta: class Meta:
model = Job model = Job

2
awx/main/tasks.py
View File

@@ -324,8 +324,6 @@ class RunJob(BaseTask):
if not super(RunJob, self).pre_run_check(job, **kwargs): if not super(RunJob, self).pre_run_check(job, **kwargs):
return False return False
# FIXME: Check if job is waiting on any projects that are being updated. # FIXME: Check if job is waiting on any projects that are being updated.
if job.project.has_active_updates:
pass
return True return True
def post_run_hook(self, job): def post_run_hook(self, job):

2
awx/main/tests/commands.py
View File

@@ -352,7 +352,7 @@ class CleanupJobsTest(BaseCommandMixin, BaseLiveServerTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)

8
awx/main/tests/jobs.py
View File

@@ -430,10 +430,10 @@ class BaseJobTestMixin(BaseTestMixin):
class JobTemplateTest(BaseJobTestMixin, django.test.TestCase): class JobTemplateTest(BaseJobTestMixin, django.test.TestCase):
JOB_TEMPLATE_FIELDS = ('id', 'url', 'related', 'summary_fields', 'created', JOB_TEMPLATE_FIELDS = ('id', 'url', 'related', 'summary_fields', 'created',
'name', 'description', 'job_type', 'inventory', 'modified', 'name', 'description', 'job_type',
'project', 'playbook', 'credential', 'forks', 'inventory', 'project', 'playbook', 'credential',
'limit', 'verbosity', 'extra_vars', 'job_tags', 'forks', 'limit', 'verbosity', 'extra_vars',
'host_config_key',) 'job_tags', 'host_config_key',)
def test_get_job_template_list(self): def test_get_job_template_list(self):
url = reverse('main:job_template_list') url = reverse('main:job_template_list')

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

@@ -381,7 +381,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -410,7 +410,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -438,7 +438,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -466,7 +466,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -590,7 +590,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -630,7 +630,7 @@ class RunJobTest(BaseCeleryTest):
# Calling cancel before start has no effect. # Calling cancel before start has no effect.
self.assertFalse(job.cancel()) self.assertFalse(job.cancel())
self.assertEqual(job.cancel_flag, False) self.assertEqual(job.cancel_flag, False)
self.assertFalse(job.get_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.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
@@ -653,7 +653,7 @@ class RunJobTest(BaseCeleryTest):
extra_vars='foo=1') extra_vars='foo=1')
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -669,7 +669,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template(limit='bad.example.com') job_template = self.create_test_job_template(limit='bad.example.com')
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -683,7 +683,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -697,8 +697,8 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.assertTrue(job.get_passwords_needed_to_start()) self.assertTrue(job.passwords_needed_to_start)
self.assertTrue('ssh_password' in job.get_passwords_needed_to_start()) self.assertTrue('ssh_password' in job.passwords_needed_to_start)
self.assertFalse(job.start()) self.assertFalse(job.start())
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertTrue(job.start(ssh_password='sshpass')) self.assertTrue(job.start(ssh_password='sshpass'))
@@ -714,7 +714,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -730,8 +730,8 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.assertTrue(job.get_passwords_needed_to_start()) self.assertTrue(job.passwords_needed_to_start)
self.assertTrue('sudo_password' in job.get_passwords_needed_to_start()) self.assertTrue('sudo_password' in job.passwords_needed_to_start)
self.assertFalse(job.start()) self.assertFalse(job.start())
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertTrue(job.start(sudo_password='sudopass')) self.assertTrue(job.start(sudo_password='sudopass'))
@@ -748,7 +748,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -762,7 +762,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -777,7 +777,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -792,8 +792,8 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.assertTrue(job.get_passwords_needed_to_start()) self.assertTrue(job.passwords_needed_to_start)
self.assertTrue('ssh_key_unlock' in job.get_passwords_needed_to_start()) self.assertTrue('ssh_key_unlock' in job.passwords_needed_to_start)
self.assertFalse(job.start()) self.assertFalse(job.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.start(ssh_key_unlock=TEST_SSH_KEY_DATA_UNLOCK))
@@ -808,7 +808,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -836,7 +836,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -864,7 +864,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
@@ -893,7 +893,7 @@ class RunJobTest(BaseCeleryTest):
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
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.get_passwords_needed_to_start()) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.start()) self.assertTrue(job.start())
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)

2
awx/main/views.py
View File

@@ -797,7 +797,7 @@ class JobStart(GenericAPIView):
can_start=obj.can_start, can_start=obj.can_start,
) )
if obj.can_start: if obj.can_start:
data['passwords_needed_to_start'] = obj.asswords_needed_to_start data['passwords_needed_to_start'] = obj.passwords_needed_to_start
return Response(data) return Response(data)
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):