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

More test fixes

Browse Source
This commit is contained in:
Akita Noek
2016-04-16 10:22:03 -04:00
parent 2c45f79298
commit 6c50d0793d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/mixins.py
View File

@@ -22,7 +22,7 @@ class ResourceMixin(models.Model):
Use instead of `MyModel.objects` when you want to only consider Use instead of `MyModel.objects` when you want to only consider
resources that a user has specific permissions for. For example: resources that a user has specific permissions for. For example:
MyModel.accessible_objects(user, {'read': True}).filter(name__istartswith='bar'); MyModel.accessible_objects(user, 'read_role').filter(name__istartswith='bar');
NOTE: This should only be used for list type things. If you have a NOTE: This should only be used for list type things. If you have a
specific resource you want to check permissions on, it is more specific resource you want to check permissions on, it is more

4
awx/main/tests/old/inventory.py
View File

@@ -77,7 +77,7 @@ class InventoryTest(BaseTest):
self.check_get_list(url, self.normal_django_user, normal_qs) self.check_get_list(url, self.normal_django_user, normal_qs)
# a user who is on a team who has a read permissions on an inventory can see filtered inventories # a user who is on a team who has a read permissions on an inventory can see filtered inventories
other_qs = Inventory.accessible_objects(self.other_django_user, {'read': True}).distinct() other_qs = Inventory.accessible_objects(self.other_django_user, 'read_role').distinct()
self.check_get_list(url, self.other_django_user, other_qs) self.check_get_list(url, self.other_django_user, other_qs)
# a regular user not part of anything cannot see any inventories # a regular user not part of anything cannot see any inventories
@@ -401,7 +401,7 @@ class InventoryTest(BaseTest):
del_children_url = reverse('api:group_children_list', args=(del_group.pk,)) del_children_url = reverse('api:group_children_list', args=(del_group.pk,))
nondel_url = reverse('api:group_detail', nondel_url = reverse('api:group_detail',
args=(Group.objects.get(name='nondel').pk,)) args=(Group.objects.get(name='nondel').pk,))
assert(inv.accessible_by(self.normal_django_user, {'read': True})) assert self.normal_django_user in inv.read_role
del_group.delete() del_group.delete()
nondel_detail = self.get(nondel_url, expect=200, auth=self.get_normal_credentials()) nondel_detail = self.get(nondel_url, expect=200, auth=self.get_normal_credentials())
self.post(del_children_url, data=nondel_detail, expect=400, auth=self.get_normal_credentials()) self.post(del_children_url, data=nondel_detail, expect=400, auth=self.get_normal_credentials())

2
awx/main/tests/old/organizations.py
View File

@@ -289,7 +289,7 @@ class OrganizationsTest(BaseTest):
# post a completely new user to verify we can add users to the subcollection directly # post a completely new user to verify we can add users to the subcollection directly
new_user = dict(username='NewUser9000', password='NewPassword9000') new_user = dict(username='NewUser9000', password='NewPassword9000')
which_org = Organization.accessible_objects(self.normal_django_user, {'read': True, 'write': True})[0] which_org = Organization.accessible_objects(self.normal_django_user, 'admin_role')[0]
url = reverse('api:organization_users_list', args=(which_org.pk,)) url = reverse('api:organization_users_list', args=(which_org.pk,))
self.post(url, new_user, expect=201, auth=self.get_normal_credentials()) self.post(url, new_user, expect=201, auth=self.get_normal_credentials())