From 5d4ba09f9331b1e2e6ac88e6522e5cdcbc894939 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sun, 30 Jan 2022 19:58:36 +0100 Subject: [PATCH 2/6] tests_rbac: factorize get_*_model calls (#57500) --- tests_rbac/test_rbac.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/tests_rbac/test_rbac.py b/tests_rbac/test_rbac.py index a6f38b95..d07a3a73 100644 --- a/tests_rbac/test_rbac.py +++ b/tests_rbac/test_rbac.py @@ -24,11 +24,14 @@ from django.test.utils import CaptureQueriesContext from django_rbac import backends, models, utils +OU = OrganizationalUnit = utils.get_ou_model() +Permission = utils.get_permission_model() +RoleParenting = utils.get_role_parenting_model() +Role = utils.get_role_model() +User = get_user_model() + def test_role_parenting(db): - OrganizationalUnit = utils.get_ou_model() - Role = utils.get_role_model() - RoleParenting = utils.get_role_parenting_model() ou = OrganizationalUnit.objects.create(name='ou') roles = [] @@ -83,11 +86,6 @@ SPAN = 50 @pytest.mark.slow def test_massive_role_parenting(db): - - User = get_user_model() - Role = utils.get_role_model() - RoleParenting = utils.get_role_parenting_model() - Permission = utils.get_permission_model() user = User.objects.create(username='user') roles = [] # Try a depth=10 tree of roles @@ -124,13 +122,9 @@ def test_massive_role_parenting(db): def test_rbac_backend(db): - Permission = utils.get_permission_model() - User = get_user_model() - OU = utils.get_ou_model() ou1 = OU.objects.create(name='ou1', slug='ou1') ou2 = OU.objects.create(name='ou2', slug='ou2') user1 = User.objects.create(username='john.doe') - Role = utils.get_role_model() ct_ct = ContentType.objects.get_for_model(ContentType) role_ct = ContentType.objects.get_for_model(Role) change_op = models.Operation.objects.get(slug='change') @@ -217,11 +211,9 @@ def test_rbac_backend(db): def test_all_members(db): - User = get_user_model() u1 = User.objects.create(username='john.doe') u2 = User.objects.create(username='donald.knuth') u3 = User.objects.create(username='alan.turing') - Role = utils.get_role_model() r1 = Role.objects.create(name='r1') r1.members.add(u1) r1.members.add(u3) -- 2.34.1