External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

Minor fixes based on comments.

Browse Source
This commit is contained in:
Chris Church 2016-02-03 13:18:49 -05:00
parent b08a2d1d88
commit ab8e37eeaa
5 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/test_api.py
View File

@ -1,4 +0,0 @@
# Copyright (c) 2016 Ansible, Inc.
# All Rights Reserved.
from awx.api.tests import * # noqa

4
awx/fact/test_fact.py
View File

@ -1,4 +0,0 @@
# Copyright (c) 2016 Ansible, Inc.
# All Rights Reserved.
from awx.fact.tests import * # noqa

9
awx/main/managers.py
View File

@ -12,11 +12,10 @@ class HostManager(models.Manager):
def active_count(self):
"""Return count of active, unique hosts for licensing."""
#try:
# return self.filter(active=True, inventory__active=True).distinct('name').count()
#except NotImplementedError: # For unit tests only, SQLite doesn't support distinct('name')
# FIXME-CC
return len(set(self.filter(active=True, inventory__active=True).values_list('name', flat=True)))
try:
return self.filter(active=True, inventory__active=True).order_by('name').distinct('name').count()
except NotImplementedError: # For unit tests only, SQLite doesn't support distinct('name')
return len(set(self.filter(active=True, inventory__active=True).values_list('name', flat=True)))
class InstanceManager(models.Manager):
"""A custom manager class for the Instance model.

4
awx/main/test_main.py
View File

@ -1,4 +0,0 @@
# Copyright (c) 2015 Ansible, Inc.
# All Rights Reserved.
from awx.main.tests import * # noqa

1
awx/main/tests/old/activity_stream.py
View File

@ -31,7 +31,6 @@ class ActivityStreamTest(BaseTest):
self.options(url, expect=200)
self.head(url, expect=200)
response = self.get(url, expect=200)
print response
self.check_pagination_and_size(response, 1, previous=None, next=None)
def test_basic_fields(self):