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

flake8 fixes

Browse Source
This commit is contained in:
Wayne Witzel III
2016-02-05 09:18:52 -05:00
parent 89236a1fe6
commit 7b3f3675f8
10 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/fields.py
View File

@@ -2,7 +2,7 @@
# All Rights Reserved. # All Rights Reserved.
# Django # Django
from django.db.models.signals import post_save, post_init from django.db.models.signals import post_save
from django.db import models from django.db import models
from django.db.models.fields.related import SingleRelatedObjectDescriptor from django.db.models.fields.related import SingleRelatedObjectDescriptor
from django.db.models.fields.related import ReverseSingleRelatedObjectDescriptor from django.db.models.fields.related import ReverseSingleRelatedObjectDescriptor

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

@@ -82,7 +82,7 @@ class Role(CommonModelNameNotUnique):
except Role.DoesNotExist: except Role.DoesNotExist:
ret = Role(singleton_name=name) ret = Role(singleton_name=name)
ret.save() ret.save()
return ret; return ret

4
awx/main/tests/functional/test_rbac_credential.py
View File

@@ -21,7 +21,7 @@ def test_credential_migration_team_member(credential, team, user, permissions):
credential.team = team credential.team = team
# No permissions pre-migration # No permissions pre-migration
assert credential.accessible_by(u, permissions['admin']) == False assert not credential.accessible_by(u, permissions['admin'])
migrated = credential.migrate_to_rbac() migrated = credential.migrate_to_rbac()
# Admin permissions post migration # Admin permissions post migration
@@ -35,7 +35,7 @@ def test_credential_migration_team_admin(credential, team, user, permissions):
credential.team = team credential.team = team
# No permissions pre-migration # No permissions pre-migration
assert credential.accessible_by(u, permissions['usage']) == False assert not credential.accessible_by(u, permissions['usage'])
# Usage permissions post migration # Usage permissions post migration
migrated = credential.migrate_to_rbac() migrated = credential.migrate_to_rbac()

10
awx/main/tests/functional/test_rbac_organization.py
View File

@@ -7,7 +7,7 @@ def test_organization_migration_admin(organization, permissions, user):
u = user('admin', True) u = user('admin', True)
organization.admins.add(u) organization.admins.add(u)
assert organization.accessible_by(u, permissions['admin']) == False assert not organization.accessible_by(u, permissions['admin'])
migrated_users = organization.migrate_to_rbac() migrated_users = organization.migrate_to_rbac()
assert len(migrated_users) == 1 assert len(migrated_users) == 1
@@ -18,7 +18,7 @@ def test_organization_migration_user(organization, permissions, user):
u = user('user', False) u = user('user', False)
organization.users.add(u) organization.users.add(u)
assert organization.accessible_by(u, permissions['auditor']) == False assert not organization.accessible_by(u, permissions['auditor'])
migrated_users = organization.migrate_to_rbac() migrated_users = organization.migrate_to_rbac()
assert len(migrated_users) == 1 assert len(migrated_users) == 1
@@ -27,7 +27,7 @@ def test_organization_migration_user(organization, permissions, user):
@pytest.mark.django_db @pytest.mark.django_db
def test_organization_access_superuser(organization, user): def test_organization_access_superuser(organization, user):
access = OrganizationAccess(user('admin', True)) access = OrganizationAccess(user('admin', True))
assert access.can_change(organization, None) == True assert access.can_change(organization, None)
@pytest.mark.django_db @pytest.mark.django_db
def test_organization_access_admin(organization, user): def test_organization_access_admin(organization, user):
@@ -35,9 +35,9 @@ def test_organization_access_admin(organization, user):
organization.admins.add(u) organization.admins.add(u)
access = OrganizationAccess(u) access = OrganizationAccess(u)
assert access.can_change(organization, None) == True assert access.can_change(organization, None)
@pytest.mark.django_db @pytest.mark.django_db
def test_organization_access_user(organization, user): def test_organization_access_user(organization, user):
access = OrganizationAccess(user('user', False)) access = OrganizationAccess(user('user', False))
assert access.can_change(organization, None) == False assert not access.can_change(organization, None)