External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 21:07:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test-labels' into devel

Browse Source
This commit is contained in:
Chris Meyers
2016-04-01 13:36:41 -04:00
parent 0a43242b0e a01b2913bb
commit ff5935ccfd
5 changed files with 307 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -400,14 +400,16 @@ def fact_services_json():
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_labels(organization):
def job_template(organization):
jt = JobTemplate(name='test-job_template')
jt.save()
jt.labels.create(name="label-1", organization=organization)
jt.labels.create(name="label-2", organization=organization)
return jt
@pytest.fixture
def job_template_labels(organization, job_template):
job_template.labels.create(name="label-1", organization=organization)
job_template.labels.create(name="label-2", organization=organization)
return job_template