From d1b47ee6353f163acb53b36e2a8698c28c2e2b25 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 4 Oct 2022 16:21:16 +0200 Subject: [PATCH 3/4] tests: fix pylint errors in test_rbac (#58696) --- tests/test_rbac.py | 15 ++++++--------- tox.ini | 1 + 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/test_rbac.py b/tests/test_rbac.py index 50c8a7679..6f8cef387 100644 --- a/tests/test_rbac.py +++ b/tests/test_rbac.py @@ -14,9 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import time - -import pytest from django.contrib.auth import get_user_model from django.contrib.contenttypes.models import ContentType from django.db import connection @@ -104,7 +101,7 @@ def test_role_parenting_soft_delete_children(db): for i in range(10): roles.append(Role.objects.create(name='r%d' % i, ou=ou)) role_parenting_qs = RoleParenting.objects.filter(Q(parent__in=roles) | Q(child__in=roles)) - assert not len(role_parenting_qs.all()) + assert not role_parenting_qs.exists() rps = [] for i in range(5): @@ -130,7 +127,7 @@ def test_role_parenting_soft_delete_parents(db): for i in range(10): roles.append(Role.objects.create(name='r%d' % i, ou=ou)) role_parenting_qs = RoleParenting.objects.filter(Q(parent__in=roles) | Q(child__in=roles)) - assert not len(role_parenting_qs.all()) + assert not role_parenting_qs.exists() rps = [] for i in range(5): @@ -167,8 +164,8 @@ def test_massive_role_parenting(db): relations.append(RoleParenting(parent=roles[i], child=roles[(i - 1) // SPAN])) RoleParenting.objects.bulk_create(relations) RoleParenting.objects.update_transitive_closure() - operation, created = models.Operation.objects.get_or_create(slug='admin') - perm, created = Permission.objects.get_or_create( + operation, _ = models.Operation.objects.get_or_create(slug='admin') + perm, _ = Permission.objects.get_or_create( operation=operation, target_ct=ContentType.objects.get_for_model(ContentType), target_id=ContentType.objects.get_for_model(User).id, @@ -293,12 +290,12 @@ def test_all_members(db): r3.add_parent(r2) r2.add_parent(r1) for member in r1.all_members(): - if member == u1 or member == u3: + if member in (u1, u3): assert member.direct == [r1] if member == u2: assert member.direct == [] for member in Role.objects.filter(id=r1.id).all_members(): - if member == u1 or member == u3: + if member in (u1, u3): assert member.direct == [r1] if member == u2: assert member.direct == [] diff --git a/tox.ini b/tox.ini index 22452a60d..e52250332 100644 --- a/tox.ini +++ b/tox.ini @@ -129,6 +129,7 @@ deps = pytest uwsgidecorators pyquery + numpy commands = ./getlasso3.sh ./pylint.sh tests/ src/ -- 2.35.1