diff --git a/allianceauth/tests/auth_utils.py b/allianceauth/tests/auth_utils.py index 232d042f..d5642d08 100644 --- a/allianceauth/tests/auth_utils.py +++ b/allianceauth/tests/auth_utils.py @@ -146,7 +146,7 @@ class AuthUtils: if alliance_id: try: alliance_id = int(alliance_id) - except: + except Exception: alliance_id = None char = EveCharacter.objects.create( @@ -180,7 +180,7 @@ class AuthUtils: if alliance_id: try: alliance_id = int(alliance_id) - except: + except Exception: alliance_id = None char = EveCharacter.objects.create( @@ -220,7 +220,7 @@ class AuthUtils: ) @classmethod - def add_permissions_to_user(cls, perms, user, disconnect_signals=True): + def add_permissions_to_user(cls, perms, user, disconnect_signals=True) -> User: """add list of permissions to user perms: list of Permission objects @@ -239,10 +239,12 @@ class AuthUtils: if disconnect_signals: cls.connect_signals() + return user + @classmethod def add_permission_to_user_by_name( cls, perm, user, disconnect_signals=True - ): + ) -> User: """returns permission specified by qualified name perm: Permission name as 'app_label.codename' @@ -252,7 +254,7 @@ class AuthUtils: disconnect_signals: whether to run process without signals """ p = cls.get_permission_by_name(perm) - cls.add_permissions_to_user([p], user, disconnect_signals) + return cls.add_permissions_to_user([p], user, disconnect_signals) @staticmethod def get_permission_by_name(perm: str) -> Permission: @@ -270,6 +272,7 @@ class AuthUtils: content_type__app_label=perm_parts[0], codename=perm_parts[1] ) + class BaseViewTestCase(TestCase): def setUp(self): self.member = AuthUtils.create_member('auth_member') diff --git a/allianceauth/tests/test_auth_utils.py b/allianceauth/tests/test_auth_utils.py index dc90a51b..1eb5d4a5 100644 --- a/allianceauth/tests/test_auth_utils.py +++ b/allianceauth/tests/test_auth_utils.py @@ -39,7 +39,7 @@ class TestAuthUtils(TestCase): def test_can_add_permission_to_user_by_name(self): user = AuthUtils.create_user('Bruce Wayne') - AuthUtils.add_permission_to_user_by_name( + user = AuthUtils.add_permission_to_user_by_name( 'auth.timer_management', user ) self.assertTrue(user.has_perm('auth.timer_management'))