mirror of
https://github.com/ansible/awx.git
synced 2026-08-02 02:49:58 -02:30
move code linting to a stricter pep8-esque auto-formatting tool, black
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
||||
__metaclass__ = type
|
||||
|
||||
import pytest
|
||||
@@ -11,22 +12,12 @@ def cred_type():
|
||||
# Make a credential type which will be used by the credential
|
||||
ct = CredentialType.objects.create(
|
||||
name='Ansible Galaxy Token',
|
||||
inputs={
|
||||
"fields": [
|
||||
{
|
||||
"id": "token",
|
||||
"type": "string",
|
||||
"secret": True,
|
||||
"label": "Ansible Galaxy Secret Token Value"
|
||||
}
|
||||
],
|
||||
"required": ["token"]
|
||||
},
|
||||
inputs={"fields": [{"id": "token", "type": "string", "secret": True, "label": "Ansible Galaxy Secret Token Value"}], "required": ["token"]},
|
||||
injectors={
|
||||
"extra_vars": {
|
||||
"galaxy_token": "{{token}}",
|
||||
}
|
||||
}
|
||||
},
|
||||
)
|
||||
return ct
|
||||
|
||||
@@ -38,12 +29,7 @@ def test_create_machine_credential(run_module, admin_user, organization, silence
|
||||
ct = CredentialType.defaults['ssh']()
|
||||
ct.save()
|
||||
# Example from docs
|
||||
result = run_module('tower_credential', dict(
|
||||
name='Test Machine Credential',
|
||||
organization=organization.name,
|
||||
kind='ssh',
|
||||
state='present'
|
||||
), admin_user)
|
||||
result = run_module('tower_credential', dict(name='Test Machine Credential', organization=organization.name, kind='ssh', state='present'), admin_user)
|
||||
assert not result.get('failed', False), result.get('msg', result)
|
||||
assert result.get('changed'), result
|
||||
|
||||
@@ -61,14 +47,11 @@ def test_create_vault_credential(run_module, admin_user, organization, silence_d
|
||||
ct = CredentialType.defaults['vault']()
|
||||
ct.save()
|
||||
|
||||
result = run_module('tower_credential', dict(
|
||||
name='Test Vault Credential',
|
||||
organization=organization.name,
|
||||
kind='vault',
|
||||
vault_id='bar',
|
||||
vault_password='foobar',
|
||||
state='present'
|
||||
), admin_user)
|
||||
result = run_module(
|
||||
'tower_credential',
|
||||
dict(name='Test Vault Credential', organization=organization.name, kind='vault', vault_id='bar', vault_password='foobar', state='present'),
|
||||
admin_user,
|
||||
)
|
||||
assert not result.get('failed', False), result.get('msg', result)
|
||||
assert result.get('changed'), result
|
||||
|
||||
@@ -83,13 +66,9 @@ def test_create_vault_credential(run_module, admin_user, organization, silence_d
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_ct_precedence_over_kind(run_module, admin_user, organization, cred_type, silence_deprecation):
|
||||
result = run_module('tower_credential', dict(
|
||||
name='A credential',
|
||||
organization=organization.name,
|
||||
kind='ssh',
|
||||
credential_type=cred_type.name,
|
||||
state='present'
|
||||
), admin_user)
|
||||
result = run_module(
|
||||
'tower_credential', dict(name='A credential', organization=organization.name, kind='ssh', credential_type=cred_type.name, state='present'), admin_user
|
||||
)
|
||||
assert not result.get('failed', False), result.get('msg', result)
|
||||
|
||||
cred = Credential.objects.get(name='A credential')
|
||||
@@ -102,14 +81,18 @@ def test_input_overrides_old_fields(run_module, admin_user, organization, silenc
|
||||
# create the vault credential type
|
||||
ct = CredentialType.defaults['vault']()
|
||||
ct.save()
|
||||
result = run_module('tower_credential', dict(
|
||||
name='A Vault credential',
|
||||
organization=organization.name,
|
||||
kind='vault',
|
||||
vault_id='1234',
|
||||
inputs={'vault_id': 'asdf'},
|
||||
state='present',
|
||||
), admin_user)
|
||||
result = run_module(
|
||||
'tower_credential',
|
||||
dict(
|
||||
name='A Vault credential',
|
||||
organization=organization.name,
|
||||
kind='vault',
|
||||
vault_id='1234',
|
||||
inputs={'vault_id': 'asdf'},
|
||||
state='present',
|
||||
),
|
||||
admin_user,
|
||||
)
|
||||
assert not result.get('failed', False), result.get('msg', result)
|
||||
|
||||
cred = Credential.objects.get(name='A Vault credential')
|
||||
@@ -120,12 +103,7 @@ def test_input_overrides_old_fields(run_module, admin_user, organization, silenc
|
||||
@pytest.mark.django_db
|
||||
def test_missing_credential_type(run_module, admin_user, organization):
|
||||
Organization.objects.create(name='test-org')
|
||||
result = run_module('tower_credential', dict(
|
||||
name='A credential',
|
||||
organization=organization.name,
|
||||
credential_type='foobar',
|
||||
state='present'
|
||||
), admin_user)
|
||||
result = run_module('tower_credential', dict(name='A credential', organization=organization.name, credential_type='foobar', state='present'), admin_user)
|
||||
assert result.get('failed', False), result
|
||||
assert 'credential_type' in result['msg']
|
||||
assert 'foobar' in result['msg']
|
||||
@@ -134,12 +112,11 @@ def test_missing_credential_type(run_module, admin_user, organization):
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_make_use_of_custom_credential_type(run_module, organization, admin_user, cred_type):
|
||||
result = run_module('tower_credential', dict(
|
||||
name='Galaxy Token for Steve',
|
||||
organization=organization.name,
|
||||
credential_type=cred_type.name,
|
||||
inputs={'token': '7rEZK38DJl58A7RxA6EC7lLvUHbBQ1'}
|
||||
), admin_user)
|
||||
result = run_module(
|
||||
'tower_credential',
|
||||
dict(name='Galaxy Token for Steve', organization=organization.name, credential_type=cred_type.name, inputs={'token': '7rEZK38DJl58A7RxA6EC7lLvUHbBQ1'}),
|
||||
admin_user,
|
||||
)
|
||||
assert not result.get('failed', False), result.get('msg', result)
|
||||
assert result.get('changed', False), result
|
||||
|
||||
@@ -159,13 +136,17 @@ def test_secret_field_write_twice(run_module, organization, admin_user, cred_typ
|
||||
val1 = '7rEZK38DJl58A7RxA6EC7lLvUHbBQ1'
|
||||
val2 = '7rEZ238DJl5837rxA6xxxlLvUHbBQ1'
|
||||
for val in (val1, val2):
|
||||
result = run_module('tower_credential', dict(
|
||||
name='Galaxy Token for Steve',
|
||||
organization=organization.name,
|
||||
credential_type=cred_type.name,
|
||||
inputs={'token': val},
|
||||
update_secrets=update_secrets
|
||||
), admin_user)
|
||||
result = run_module(
|
||||
'tower_credential',
|
||||
dict(
|
||||
name='Galaxy Token for Steve',
|
||||
organization=organization.name,
|
||||
credential_type=cred_type.name,
|
||||
inputs={'token': val},
|
||||
update_secrets=update_secrets,
|
||||
),
|
||||
admin_user,
|
||||
)
|
||||
assert not result.get('failed', False), result.get('msg', result)
|
||||
|
||||
if update_secrets:
|
||||
|
||||
Reference in New Issue
Block a user