External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 15:09:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update to fix tests

Browse Source
This commit is contained in:
Jeff Bradberry
2019-02-06 16:39:18 -05:00
parent 6399ec59c9
commit 0e8e5f65e1
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -1259,7 +1259,7 @@ class OrganizationSerializer(BaseSerializer):
if counts_dict is not None and summary_dict is not None:
if obj.id not in counts_dict:
summary_dict['related_field_counts'] = {
'inventories': 0, 'teams': 0, 'users': 0,
'inventories': 0, 'teams': 0, 'users': 0, 'hosts': 0,
'job_templates': 0, 'admins': 0, 'projects': 0}
else:
summary_dict['related_field_counts'] = counts_dict[obj.id]

17
awx/main/tests/functional/api/test_organization_counts.py
View File

@@ -5,7 +5,7 @@ from awx.api.versioning import reverse
@pytest.fixture
def organization_resource_creator(organization, user):
def rf(users, admins, job_templates, projects, inventories, teams):
def rf(users, admins, job_templates, projects, inventories, teams, hosts):
# Associate one resource of every type with the organization
for i in range(users):
@@ -48,7 +48,8 @@ COUNTS_PRIMES = {
'job_templates': 3,
'projects': 3,
'inventories': 7,
'teams': 5
'teams': 5,
'hosts': 0,
}
COUNTS_ZEROS = {
'users': 0,
@@ -56,7 +57,8 @@ COUNTS_ZEROS = {
'job_templates': 0,
'projects': 0,
'inventories': 0,
'teams': 0
'teams': 0,
'hosts': 0,
}
@@ -92,7 +94,8 @@ def test_org_counts_detail_member(resourced_organization, user, get):
'job_templates': 0,
'projects': 0,
'inventories': 0,
'teams': 0
'teams': 0,
'hosts': 0,
}
@@ -123,7 +126,8 @@ def test_org_counts_list_member(resourced_organization, user, get):
'job_templates': 0,
'projects': 0,
'inventories': 0,
'teams': 0
'teams': 0,
'hosts': 0,
}
@@ -230,5 +234,6 @@ def test_JT_associated_with_project(organizations, project, user, get):
'job_templates': 1,
'projects': 1,
'inventories': 0,
'teams': 0
'teams': 0,
'hosts': 0,
}