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

fixed check_license to work with py.test

Browse Source
This commit is contained in:
Wayne Witzel III
2016-02-01 18:17:23 -05:00
parent 320a5b7776
commit a44318f0cd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/main/access.py
View File

@@ -149,7 +149,7 @@ class BaseAccess(object):
def check_license(self, add_host=False, feature=None, check_expiration=True): def check_license(self, add_host=False, feature=None, check_expiration=True):
reader = TaskSerializer() reader = TaskSerializer()
validation_info = reader.from_database() validation_info = reader.from_database()
if ('test' in sys.argv or 'jenkins' in sys.argv) and not os.environ.get('SKIP_LICENSE_FIXUP_FOR_TEST', ''): if ('test' in sys.argv or 'py.test' in sys.argv[0] or 'jenkins' in sys.argv) and not os.environ.get('SKIP_LICENSE_FIXUP_FOR_TEST', ''):
validation_info['free_instances'] = 99999999 validation_info['free_instances'] = 99999999
validation_info['time_remaining'] = 99999999 validation_info['time_remaining'] = 99999999
validation_info['grace_period_remaining'] = 99999999 validation_info['grace_period_remaining'] = 99999999
@@ -912,8 +912,8 @@ class JobTemplateAccess(BaseAccess):
) )
return base_qs.filter( return base_qs.filter(
Q(id__in=org_admin_ids) | Q(id__in=org_admin_ids) |
Q(id__in=perm_deploy_ids) | Q(id__in=perm_deploy_ids) |
Q(id__in=perm_check_ids) Q(id__in=perm_check_ids)
) )
@@ -926,7 +926,7 @@ class JobTemplateAccess(BaseAccess):
a user can create a job template if they are a superuser, an org admin a user can create a job template if they are a superuser, an org admin
of any org that the project is a member, or if they have user or team of any org that the project is a member, or if they have user or team
based permissions tying the project to the inventory source for the based permissions tying the project to the inventory source for the
given action as well as the 'create' deploy permission. given action as well as the 'create' deploy permission.
Users who are able to create deploy jobs can also run normal and check (dry run) jobs. Users who are able to create deploy jobs can also run normal and check (dry run) jobs.
''' '''
if not data or '_method' in data: # So the browseable API will work? if not data or '_method' in data: # So the browseable API will work?
@@ -1126,8 +1126,8 @@ class JobAccess(BaseAccess):
) )
return base_qs.filter( return base_qs.filter(
Q(id__in=org_admin_ids) | Q(id__in=org_admin_ids) |
Q(id__in=perm_deploy_ids) | Q(id__in=perm_deploy_ids) |
Q(id__in=perm_check_ids) Q(id__in=perm_check_ids)
) )
@@ -1367,9 +1367,9 @@ class UnifiedJobTemplateAccess(BaseAccess):
projects without SCM configured or inventory sources without a cloud projects without SCM configured or inventory sources without a cloud
source. source.
''' '''
model = UnifiedJobTemplate model = UnifiedJobTemplate
def get_queryset(self): def get_queryset(self):
qs = self.model.objects.filter(active=True).distinct() qs = self.model.objects.filter(active=True).distinct()
project_qs = self.user.get_queryset(Project).filter(scm_type__in=[s[0] for s in Project.SCM_TYPE_CHOICES]) project_qs = self.user.get_queryset(Project).filter(scm_type__in=[s[0] for s in Project.SCM_TYPE_CHOICES])