Merge pull request #5584 from AlanCoding/vault_credential_test

[AWX collection] Add test for deprecated vault_credential

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awx_collection/plugins/modules/tower_job_template.py

@@ -68,7 +68,7 @@ options:
     vault_credential:
       description:
         - Name of the vault credential to use for the job template.
-        - Deprecated, mutually exclusive with 'credential'.
+        - Deprecated, mutually exclusive with 'credentials'.
       version_added: 2.7
       type: str
     forks:

awx_collection/test/awx/conftest.py

@@ -146,3 +146,13 @@ def machine_credential(organization):
         credential_type=ssh_type, name='machine-cred',
         inputs={'username': 'test_user', 'password': 'pas4word'}
     )
+
+
+@pytest.fixture
+def vault_credential(organization):
+    ct = CredentialType.defaults['vault']()
+    ct.save()
+    return Credential.objects.create(
+        credential_type=ct, name='vault-cred',
+        inputs={'vault_id': 'foo', 'vault_password': 'pas4word'}
+    )

awx_collection/test/awx/test_job_template.py

@@ -64,11 +64,15 @@ def test_job_launch_with_prompting(run_module, admin_user, project, inventory, m
 
 
 @pytest.mark.django_db
-def test_create_job_template_with_old_machine_cred(run_module, admin_user, project, inventory, machine_credential):
+def test_create_job_template_with_old_credentials(
+        run_module, admin_user, project, inventory,
+        machine_credential, vault_credential):
 
     module_args = {
         'name': 'foo', 'playbook': 'helloworld.yml',
-        'project': project.name, 'inventory': inventory.name, 'credential': machine_credential.name,
+        'project': project.name, 'inventory': inventory.name,
+        'credential': machine_credential.name,
+        'vault_credential': vault_credential.name,
         'job_type': 'run',
         'state': 'present'
     }
@@ -87,11 +91,14 @@ def test_create_job_template_with_old_machine_cred(run_module, admin_user, proje
         }
     }
 
-    assert machine_credential.id in [cred.pk for cred in jt.credentials.all()]
+    assert set([machine_credential.id, vault_credential.id]) == set([
+        cred.pk for cred in jt.credentials.all()])
 
 
 @pytest.mark.django_db
-def test_create_job_template_with_new_credentials(run_module, admin_user, project, inventory, machine_credential):
+def test_create_job_template_with_new_credentials(
+        run_module, admin_user, project, inventory,
+        machine_credential, vault_credential):
     jt = JobTemplate.objects.create(
         name='foo',
         playbook='helloworld.yml',
@@ -102,7 +109,7 @@ def test_create_job_template_with_new_credentials(run_module, admin_user, projec
         name='foo',
         playbook='helloworld.yml',
         project=project.name,
-        credentials=[machine_credential.name]
+        credentials=[machine_credential.name, vault_credential.name]
     ), admin_user)
     assert result.pop('changed', None), result
 
@@ -113,4 +120,5 @@ def test_create_job_template_with_new_credentials(run_module, admin_user, projec
         "id": jt.id
     }
 
-    assert [machine_credential.id] == [cred.pk for cred in jt.credentials.all()]
+    assert set([machine_credential.id, vault_credential.id]) == set([
+        cred.pk for cred in jt.credentials.all()])