mirror of
https://github.com/ansible/awx.git
synced 2026-05-13 12:27:37 -02:30
Fix migration issues, tests, and templates
This commit is contained in:
@@ -16,6 +16,7 @@ from awx.main.access import (
|
||||
from awx.conf.license import LicenseForbids
|
||||
from awx.main.models import (
|
||||
Credential,
|
||||
CredentialType,
|
||||
Inventory,
|
||||
Project,
|
||||
Role,
|
||||
@@ -57,7 +58,7 @@ class TestRelatedFieldAccess:
|
||||
def test_new_with_bad_data(self, access, mocker):
|
||||
data = {'related': 3.1415}
|
||||
with pytest.raises(ParseError):
|
||||
access.check_related('related', mocker.MagicMock, data)
|
||||
access.check_related('related', mocker.MagicMock(), data)
|
||||
|
||||
def test_new_mandatory_fail(self, access, mocker):
|
||||
access.user.is_superuser = False
|
||||
@@ -118,10 +119,18 @@ class TestRelatedFieldAccess:
|
||||
@pytest.fixture
|
||||
def job_template_with_ids(job_template_factory):
|
||||
# Create non-persisted objects with IDs to send to job_template_factory
|
||||
credential = Credential(id=1, pk=1, name='testcred', kind='ssh')
|
||||
net_cred = Credential(id=2, pk=2, name='testnetcred', kind='net')
|
||||
cloud_cred = Credential(id=3, pk=3, name='testcloudcred', kind='aws')
|
||||
vault_cred = Credential(id=4, pk=4, name='testnetcred', kind='vault')
|
||||
ssh_type = CredentialType(kind='ssh')
|
||||
credential = Credential(id=1, pk=1, name='testcred', credential_type=ssh_type)
|
||||
|
||||
net_type = CredentialType(kind='net')
|
||||
net_cred = Credential(id=2, pk=2, name='testnetcred', credential_type=net_type)
|
||||
|
||||
cloud_type = CredentialType(kind='aws')
|
||||
cloud_cred = Credential(id=3, pk=3, name='testcloudcred', credential_type=cloud_type)
|
||||
|
||||
vault_type = CredentialType(kind='vault')
|
||||
vault_cred = Credential(id=4, pk=4, name='testnetcred', credential_type=vault_type)
|
||||
|
||||
inv = Inventory(id=11, pk=11, name='testinv')
|
||||
proj = Project(id=14, pk=14, name='testproj')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user