External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4571 from ryanpetrello/v2-test-cleanup

Browse Source 
clean up old v2 versioning in API tests

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-08-22 21:57:44 +00:00 committed by GitHub
commit e13274c73f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 294 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

684
awx/main/tests/functional/api/test_credential.py
View File

File diff suppressed because it is too large Load Diff

49
awx/main/tests/functional/api/test_credential_input_sources.py
View File

@ -6,10 +6,7 @@ from awx.api.versioning import reverse
@pytest.mark.django_db
def test_associate_credential_input_source(get, post, delete, admin, vault_credential, external_credential):
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
list_url = reverse('api:credential_input_source_list')
# attach
params = {
@ -35,7 +32,7 @@ def test_associate_credential_input_source(get, post, delete, admin, vault_crede
response = delete(
reverse(
'api:credential_input_source_detail',
kwargs={'version': 'v2', 'pk': detail.data['id']}
kwargs={'pk': detail.data['id']}
),
admin
)
@ -55,10 +52,7 @@ def test_associate_credential_input_source(get, post, delete, admin, vault_crede
{'extraneous': 'foo'}, # invalid parameter
])
def test_associate_credential_input_source_with_invalid_metadata(get, post, admin, vault_credential, external_credential, metadata):
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'},
)
list_url = reverse('api:credential_input_source_list')
params = {
'target_credential': vault_credential.pk,
@ -81,7 +75,6 @@ def test_create_from_list(get, post, admin, vault_credential, external_credentia
}
assert post(reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
), params, admin).status_code == 201
assert CredentialInputSource.objects.count() == 1
@ -90,7 +83,6 @@ def test_create_from_list(get, post, admin, vault_credential, external_credentia
def test_create_credential_input_source_with_external_target_returns_400(post, admin, external_credential, other_external_credential):
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
params = {
'target_credential': other_external_credential.pk,
@ -107,7 +99,6 @@ def test_create_credential_input_source_with_external_target_returns_400(post, a
def test_input_source_rbac_associate(get, post, delete, alice, vault_credential, external_credential):
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
params = {
'target_credential': vault_credential.pk,
@ -142,7 +133,7 @@ def test_input_source_rbac_associate(get, post, delete, alice, vault_credential,
# alice can't admin the target (so she can't remove the input source)
delete_url = reverse(
'api:credential_input_source_detail',
kwargs={'version': 'v2', 'pk': detail.data['id']}
kwargs={'pk': detail.data['id']}
)
response = delete(delete_url, alice)
assert response.status_code == 403
@ -159,7 +150,7 @@ def test_input_source_detail_rbac(get, post, patch, delete, admin, alice,
other_external_credential):
sublist_url = reverse(
'api:credential_input_source_sublist',
kwargs={'version': 'v2', 'pk': vault_credential.pk}
kwargs={'pk': vault_credential.pk}
)
params = {
'source_credential': external_credential.pk,
@ -213,10 +204,7 @@ def test_input_source_detail_rbac(get, post, patch, delete, admin, alice,
def test_input_source_create_rbac(get, post, patch, delete, alice,
vault_credential, external_credential,
other_external_credential):
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
list_url = reverse('api:credential_input_source_list')
params = {
'target_credential': vault_credential.pk,
'source_credential': external_credential.pk,
@ -248,10 +236,7 @@ def test_input_source_rbac_swap_target_credential(get, post, put, patch, admin,
# you have to have admin role on the *original* credential (so you can
# remove the relationship) *and* on the *new* credential (so you can apply the
# new relationship)
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
list_url = reverse('api:credential_input_source_list')
params = {
'target_credential': vault_credential.pk,
'source_credential': external_credential.pk,
@ -292,10 +277,7 @@ def test_input_source_rbac_change_metadata(get, post, put, patch, admin, alice,
machine_credential, external_credential):
# To change an input source, a user must have admin permissions on the
# target credential and use permissions on the source credential.
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
list_url = reverse('api:credential_input_source_list')
params = {
'target_credential': machine_credential.pk,
'source_credential': external_credential.pk,
@ -328,10 +310,7 @@ def test_input_source_rbac_change_metadata(get, post, put, patch, admin, alice,
@pytest.mark.django_db
def test_create_credential_input_source_with_non_external_source_returns_400(post, admin, credential, vault_credential):
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
list_url = reverse('api:credential_input_source_list')
params = {
'target_credential': vault_credential.pk,
'source_credential': credential.pk,
@ -344,10 +323,7 @@ def test_create_credential_input_source_with_non_external_source_returns_400(pos
@pytest.mark.django_db
def test_create_credential_input_source_with_undefined_input_returns_400(post, admin, vault_credential, external_credential):
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
list_url = reverse('api:credential_input_source_list')
params = {
'target_credential': vault_credential.pk,
'source_credential': external_credential.pk,
@ -361,10 +337,7 @@ def test_create_credential_input_source_with_undefined_input_returns_400(post, a
@pytest.mark.django_db
def test_create_credential_input_source_with_already_used_input_returns_400(post, admin, vault_credential, external_credential, other_external_credential):
list_url = reverse(
'api:credential_input_source_list',
kwargs={'version': 'v2'}
)
list_url = reverse('api:credential_input_source_list')
all_params = [{
'target_credential': vault_credential.pk,
'source_credential': external_credential.pk,

8
awx/main/tests/functional/api/test_deprecated_credential_assignment.py
View File

@ -32,7 +32,7 @@ def test_extra_credentials_filtering(get, job_template, admin,
job_template.credentials.add(credential)
url = reverse(
'api:job_template_extra_credentials_list',
kwargs={'version': 'v2', 'pk': job_template.pk}
kwargs={'pk': job_template.pk}
)
resp = get(url, admin, expect=200)
assert resp.data['count'] == 1
@ -45,7 +45,7 @@ def test_extra_credentials_requires_cloud_or_net(get, post, job_template, admin,
net_credential):
url = reverse(
'api:job_template_extra_credentials_list',
kwargs={'version': 'v2', 'pk': job_template.pk}
kwargs={'pk': job_template.pk}
)
for cred in (machine_credential, vault_credential):
@ -63,7 +63,7 @@ def test_extra_credentials_requires_cloud_or_net(get, post, job_template, admin,
def test_prevent_multiple_machine_creds(get, post, job_template, admin, machine_credential):
url = reverse(
'api:job_template_credentials_list',
kwargs={'version': 'v2', 'pk': job_template.pk}
kwargs={'pk': job_template.pk}
)
def _new_cred(name):
@ -120,7 +120,7 @@ def test_extra_credentials_unique_by_kind(get, post, job_template, admin,
credentialtype_aws):
url = reverse(
'api:job_template_extra_credentials_list',
kwargs={'version': 'v2', 'pk': job_template.pk}
kwargs={'pk': job_template.pk}
)
def _new_cred(name):

4
awx/main/tests/functional/api/test_generic.py
View File

@ -70,7 +70,7 @@ class TestDeleteViews:
delete(
reverse(
'api:inventory_source_hosts_list',
kwargs={'version': 'v2', 'pk': inventory_source.pk}
kwargs={'pk': inventory_source.pk}
), user=rando, expect=403
)
@ -80,7 +80,7 @@ class TestDeleteViews:
delete(
reverse(
'api:inventory_source_hosts_list',
kwargs={'version': 'v2', 'pk': inventory_source.pk}
kwargs={'pk': inventory_source.pk}
), user=rando, expect=204
)
assert inventory_source.hosts.count() == 0

4
awx/main/tests/functional/api/test_inventory.py
View File

@ -600,7 +600,7 @@ class TestControlledBySCM:
assert scm_inventory.inventory_sources.count() == 0
def test_adding_inv_src_ok(self, post, scm_inventory, admin_user):
post(reverse('api:inventory_inventory_sources_list', kwargs={'version': 'v2', 'pk': scm_inventory.id}),
post(reverse('api:inventory_inventory_sources_list', kwargs={'pk': scm_inventory.id}),
{'name': 'new inv src', 'update_on_project_update': False, 'source': 'scm', 'overwrite_vars': True},
admin_user, expect=201)
@ -611,7 +611,7 @@ class TestControlledBySCM:
def test_two_update_on_project_update_inv_src_prohibited(self, patch, scm_inventory, factory_scm_inventory, project, admin_user):
scm_inventory2 = factory_scm_inventory(name="scm_inventory2")
res = patch(reverse('api:inventory_source_detail', kwargs={'version': 'v2', 'pk': scm_inventory2.id}),
res = patch(reverse('api:inventory_source_detail', kwargs={'pk': scm_inventory2.id}),
{'update_on_project_update': True,},
admin_user, expect=400)
content = json.loads(res.content)

8
awx/main/tests/functional/api/test_job.py
View File

@ -31,7 +31,7 @@ def test_extra_credentials(get, organization_factory, job_template_factory, cred
jt.save()
job = jt.create_unified_job()
url = reverse('api:job_extra_credentials_list', kwargs={'version': 'v2', 'pk': job.pk})
url = reverse('api:job_extra_credentials_list', kwargs={'pk': job.pk})
response = get(url, user=objs.superusers.admin)
assert response.data.get('count') == 1
@ -225,19 +225,19 @@ def test_disallowed_http_update_methods(put, patch, post, inventory, project, ad
)
job = jt.create_unified_job()
post(
url=reverse('api:job_detail', kwargs={'pk': job.pk, 'version': 'v2'}),
url=reverse('api:job_detail', kwargs={'pk': job.pk}),
data={},
user=admin_user,
expect=405
)
put(
url=reverse('api:job_detail', kwargs={'pk': job.pk, 'version': 'v2'}),
url=reverse('api:job_detail', kwargs={'pk': job.pk}),
data={},
user=admin_user,
expect=405
)
patch(
url=reverse('api:job_detail', kwargs={'pk': job.pk, 'version': 'v2'}),
url=reverse('api:job_detail', kwargs={'pk': job.pk}),
data={},
user=admin_user,
expect=405

12
awx/main/tests/functional/api/test_job_template.py
View File

@ -46,7 +46,7 @@ def test_extra_credential_creation(get, post, organization_factory, job_template
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
url = reverse('api:job_template_extra_credentials_list', kwargs={'version': 'v2', 'pk': jt.pk})
url = reverse('api:job_template_extra_credentials_list', kwargs={'pk': jt.pk})
response = post(url, {
'name': 'My Cred',
'credential_type': credentialtype_aws.pk,
@ -68,7 +68,7 @@ def test_invalid_credential_kind_xfail(get, post, organization_factory, job_temp
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
url = reverse('api:job_template_credentials_list', kwargs={'version': 'v2', 'pk': jt.pk})
url = reverse('api:job_template_credentials_list', kwargs={'pk': jt.pk})
cred_type = CredentialType.defaults[kind]()
cred_type.save()
response = post(url, {
@ -88,7 +88,7 @@ def test_extra_credential_unique_type_xfail(get, post, organization_factory, job
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
url = reverse('api:job_template_extra_credentials_list', kwargs={'version': 'v2', 'pk': jt.pk})
url = reverse('api:job_template_extra_credentials_list', kwargs={'pk': jt.pk})
response = post(url, {
'name': 'My Cred',
'credential_type': credentialtype_aws.pk,
@ -124,7 +124,7 @@ def test_attach_extra_credential(get, post, organization_factory, job_template_f
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
url = reverse('api:job_template_extra_credentials_list', kwargs={'version': 'v2', 'pk': jt.pk})
url = reverse('api:job_template_extra_credentials_list', kwargs={'pk': jt.pk})
response = post(url, {
'associate': True,
'id': credential.id,
@ -143,7 +143,7 @@ def test_detach_extra_credential(get, post, organization_factory, job_template_f
jt.credentials.add(credential)
jt.save()
url = reverse('api:job_template_extra_credentials_list', kwargs={'version': 'v2', 'pk': jt.pk})
url = reverse('api:job_template_extra_credentials_list', kwargs={'pk': jt.pk})
response = post(url, {
'disassociate': True,
'id': credential.id,
@ -161,7 +161,7 @@ def test_attach_extra_credential_wrong_kind_xfail(get, post, organization_factor
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
url = reverse('api:job_template_extra_credentials_list', kwargs={'version': 'v2', 'pk': jt.pk})
url = reverse('api:job_template_extra_credentials_list', kwargs={'pk': jt.pk})
response = post(url, {
'associate': True,
'id': machine_credential.id,

2
awx/main/tests/functional/api/test_pagination.py
View File

@ -51,7 +51,7 @@ def test_pagination_cap_page_size(get, admin, inventory):
def host_list_url(params):
request_qs = '?' + urlencode(params)
return reverse('api:host_list', kwargs={'version': 'v2'}) + request_qs
return reverse('api:host_list') + request_qs
with patch('awx.api.pagination.Pagination.max_page_size', 5):
resp = get(host_list_url({'page': '2', 'page_size': '10'}), user=admin)

4
awx/main/tests/functional/api/test_script_endpoint.py
View File

@ -11,7 +11,7 @@ def test_empty_inventory(post, get, admin_user, organization, group_factory):
kind='',
organization=organization)
inventory.save()
resp = get(reverse('api:inventory_script_view', kwargs={'version': 'v2', 'pk': inventory.pk}), admin_user)
resp = get(reverse('api:inventory_script_view', kwargs={'pk': inventory.pk}), admin_user)
jdata = json.loads(resp.content)
jdata.pop('all')
@ -27,7 +27,7 @@ def test_ungrouped_hosts(post, get, admin_user, organization, group_factory):
inventory.save()
Host.objects.create(name='first_host', inventory=inventory)
Host.objects.create(name='second_host', inventory=inventory)
resp = get(reverse('api:inventory_script_view', kwargs={'version': 'v2', 'pk': inventory.pk}), admin_user)
resp = get(reverse('api:inventory_script_view', kwargs={'pk': inventory.pk}), admin_user)
jdata = json.loads(resp.content)
assert inventory.hosts.count() == 2
assert len(jdata['all']['hosts']) == 2

4
awx/main/tests/functional/api/test_workflow_node.py
View File

@ -55,7 +55,7 @@ def test_node_rejects_unprompted_fields(inventory, project, workflow_job_templat
ask_limit_on_launch = False
)
url = reverse('api:workflow_job_template_workflow_nodes_list',
kwargs={'pk': workflow_job_template.pk, 'version': 'v2'})
kwargs={'pk': workflow_job_template.pk})
r = post(url, {'unified_job_template': job_template.pk, 'limit': 'webservers'},
user=admin_user, expect=400)
assert 'limit' in r.data
@ -71,7 +71,7 @@ def test_node_accepts_prompted_fields(inventory, project, workflow_job_template,
ask_limit_on_launch = True
)
url = reverse('api:workflow_job_template_workflow_nodes_list',
kwargs={'pk': workflow_job_template.pk, 'version': 'v2'})
kwargs={'pk': workflow_job_template.pk})
post(url, {'unified_job_template': job_template.pk, 'limit': 'webservers'},
user=admin_user, expect=201)

2
awx/main/tests/functional/test_rbac_job_templates.py
View File

@ -106,7 +106,7 @@ def test_job_template_extra_credentials_prompts_access(
jt.credentials.add(machine_credential)
jt.execute_role.members.add(rando)
r = post(
reverse('api:job_template_launch', kwargs={'version': 'v2', 'pk': jt.id}),
reverse('api:job_template_launch', kwargs={'pk': jt.id}),
{'credentials': [machine_credential.pk, vault_credential.pk]}, rando
)
assert r.status_code == 403