From 9b204e737e1b2c581803f509bc5ca2dfe07afda3 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Tue, 29 Oct 2013 16:14:51 -0400 Subject: [PATCH] AC-537 Work on getting unit tests to pass. --- awx/main/tests/inventory.py | 15 +++++++++++---- awx/main/tests/jobs.py | 34 +++++++++++++++++----------------- awx/main/tests/tasks.py | 7 +++---- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/awx/main/tests/inventory.py b/awx/main/tests/inventory.py index bf67b145f6..5d42d23041 100644 --- a/awx/main/tests/inventory.py +++ b/awx/main/tests/inventory.py @@ -1032,9 +1032,12 @@ class InventoryUpdatesTest(BaseTransactionTest): source_regions = getattr(settings, 'TEST_AWS_REGIONS', 'all') if not all([source_username, source_password]): self.skipTest('no test ec2 credentials defined!') + credential = Credential.objects.create(kind='aws', + user=self.super_django_user, + username=source_username, + password=source_password) inventory_source = self.update_inventory_source(self.group, - source='ec2', source_username=source_username, - source_password=source_password, source_regions=source_regions, + source='ec2', credential=credential, source_regions=source_regions, source_vars='---') self.check_inventory_source(inventory_source) @@ -1044,7 +1047,11 @@ class InventoryUpdatesTest(BaseTransactionTest): source_regions = getattr(settings, 'TEST_RACKSPACE_REGIONS', '') if not all([source_username, source_password]): self.skipTest('no test rackspace credentials defined!') + credential = Credential.objects.create(kind='rax', + user=self.super_django_user, + username=source_username, + password=source_password) inventory_source = self.update_inventory_source(self.group, - source='rackspace', source_username=source_username, - source_password=source_password, source_regions=source_regions) + source='rackspace', credential=credential, + source_regions=source_regions) self.check_inventory_source(inventory_source) diff --git a/awx/main/tests/jobs.py b/awx/main/tests/jobs.py index a96a7c58be..48c3b1574f 100644 --- a/awx/main/tests/jobs.py +++ b/awx/main/tests/jobs.py @@ -235,60 +235,60 @@ class BaseJobTestMixin(BaseTestMixin): TEST_SSH_KEY_DATA_LOCKED, TEST_SSH_KEY_DATA_UNLOCK) self.cred_bob = self.user_bob.credentials.create( - ssh_username='bob', - ssh_password='ASK', + username='bob', + password='ASK', created_by=self.user_sue, ) self.cred_chuck = self.user_chuck.credentials.create( - ssh_username='chuck', + username='chuck', ssh_key_data=TEST_SSH_KEY_DATA, created_by=self.user_sue, ) self.cred_doug = self.user_doug.credentials.create( - ssh_username='doug', - ssh_password='doug doesn\'t mind his password being saved. this ' + username='doug', + password='doug doesn\'t mind his password being saved. this ' 'is why we dont\'t let doug actually run jobs.', created_by=self.user_sue, ) self.cred_eve = self.user_eve.credentials.create( - ssh_username='eve', - ssh_password='ASK', + username='eve', + password='ASK', sudo_username='root', sudo_password='ASK', created_by=self.user_sue, ) self.cred_frank = self.user_frank.credentials.create( - ssh_username='frank', - ssh_password='fr@nk the t@nk', + username='frank', + password='fr@nk the t@nk', created_by=self.user_sue, ) self.cred_greg = self.user_greg.credentials.create( - ssh_username='greg', + username='greg', ssh_key_data=TEST_SSH_KEY_DATA_LOCKED, ssh_key_unlock='ASK', created_by=self.user_sue, ) self.cred_holly = self.user_holly.credentials.create( - ssh_username='holly', - ssh_password='holly rocks', + username='holly', + password='holly rocks', created_by=self.user_sue, ) self.cred_iris = self.user_iris.credentials.create( - ssh_username='iris', - ssh_password='ASK', + username='iris', + password='ASK', created_by=self.user_sue, ) # Each operations team also has shared credentials they can use. self.cred_ops_east = self.team_ops_east.credentials.create( - ssh_username='east', + username='east', ssh_key_data=TEST_SSH_KEY_DATA_LOCKED, ssh_key_unlock=TEST_SSH_KEY_DATA_UNLOCK, created_by = self.user_sue, ) self.cred_ops_west = self.team_ops_west.credentials.create( - ssh_username='west', - ssh_password='Heading270', + username='west', + password='Heading270', created_by = self.user_sue, ) diff --git a/awx/main/tests/tasks.py b/awx/main/tests/tasks.py index edb821c0eb..304a1cce1d 100644 --- a/awx/main/tests/tasks.py +++ b/awx/main/tests/tasks.py @@ -192,10 +192,10 @@ class RunJobTest(BaseCeleryTest): opts = { 'name': 'test-creds', 'user': self.super_django_user, - 'ssh_username': '', + 'username': '', 'ssh_key_data': '', 'ssh_key_unlock': '', - 'ssh_password': '', + 'password': '', 'sudo_username': '', 'sudo_password': '', } @@ -706,8 +706,7 @@ class RunJobTest(BaseCeleryTest): self.assertTrue('-l' in self.run_job_args) def test_ssh_username_and_password(self): - self.create_test_credential(ssh_username='sshuser', - ssh_password='sshpass') + self.create_test_credential(username='sshuser', password='sshpass') self.create_test_project(TEST_PLAYBOOK) job_template = self.create_test_job_template() job = self.create_test_job(job_template=job_template)