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

Remove old pre-vault version checks that are breaking unit tests

Browse Source
This commit is contained in:
Matthew Jones
2015-03-26 13:37:20 -04:00
parent 345e2fc65e
commit 180a262d36
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@
# All Rights Reserved. # All Rights Reserved.
# Python # Python
from distutils.version import StrictVersion as Version
import glob import glob
import json import json
import os import os
@@ -1087,12 +1086,8 @@ class RunJobTest(BaseJobExecutionTest):
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.assertTrue(job.signal_start()) self.assertTrue(job.signal_start())
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
if Version(self.ansible_version) >= Version('1.5'): self.check_job_result(job, 'successful')
self.check_job_result(job, 'successful') self.assertTrue('"--ask-vault-pass"' in job.job_args)
self.assertTrue('"--ask-vault-pass"' in job.job_args)
else:
self.check_job_result(job, 'failed')
self.assertFalse('"--ask-vault-pass"' in job.job_args)
def test_vault_ask_password(self): def test_vault_ask_password(self):
self.create_test_credential(vault_password='ASK') self.create_test_credential(vault_password='ASK')
@@ -1106,12 +1101,8 @@ class RunJobTest(BaseJobExecutionTest):
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
self.assertTrue(job.signal_start(vault_password=TEST_VAULT_PASSWORD)) self.assertTrue(job.signal_start(vault_password=TEST_VAULT_PASSWORD))
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
if Version(self.ansible_version) >= Version('1.5'): self.check_job_result(job, 'successful')
self.check_job_result(job, 'successful') self.assertTrue('"--ask-vault-pass"' in job.job_args)
self.assertTrue('"--ask-vault-pass"' in job.job_args)
else:
self.check_job_result(job, 'failed')
self.assertFalse('"--ask-vault-pass"' in job.job_args)
def test_vault_bad_password(self): def test_vault_bad_password(self):
self.create_test_credential(vault_password='not it') self.create_test_credential(vault_password='not it')
@@ -1123,10 +1114,7 @@ class RunJobTest(BaseJobExecutionTest):
self.assertTrue(job.signal_start()) self.assertTrue(job.signal_start())
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')
if Version(self.ansible_version) >= Version('1.5'): self.assertTrue('"--ask-vault-pass"' in job.job_args)
self.assertTrue('"--ask-vault-pass"' in job.job_args)
else:
self.assertFalse('"--ask-vault-pass"' in job.job_args)
def _test_cloud_credential_environment_variables(self, kind): def _test_cloud_credential_environment_variables(self, kind):
if kind == 'aws': if kind == 'aws':