zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-26 01:41:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Initial pass of removing RBAC deprecated fields and Permission

Browse Source
This commit is contained in:
Wayne Witzel III
2017-05-02 13:46:20 -04:00
parent 6fe133dc7f
commit 11eb99820d
14 changed files with 2 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/tests/functional/conftest.py
View File

@@ -19,7 +19,6 @@ from jsonbfield.fields import JSONField
# AWX
from awx.main.models.projects import Project
from awx.main.models.base import PERM_INVENTORY_READ
from awx.main.models.ha import Instance
from awx.main.models.fact import Fact
@@ -38,7 +37,6 @@ from awx.main.models.inventory import (
)
from awx.main.models.organization import (
Organization,
Permission,
Team,
)
from awx.main.models.rbac import Role
@@ -528,11 +526,6 @@ def fact_services_json():
return _fact_json('services')
@pytest.fixture
def permission_inv_read(organization, inventory, team):
return Permission.objects.create(inventory=inventory, team=team, permission_type=PERM_INVENTORY_READ)
@pytest.fixture
def job_template(organization):
jt = JobTemplate(name='test-job_template')