From 33b3c5b36e1f6b2a44b725cdf7df895866cf5150 Mon Sep 17 00:00:00 2001
From: Joel Falknau <joel.falknau@gmail.com>
Date: Mon, 3 Mar 2025 14:48:10 +1000
Subject: [PATCH] fix tests after precommit

---
 allianceauth/services/modules/discord/tasks.py     | 10 +++++-----
 allianceauth/services/modules/teamspeak3/models.py | 13 +++++++------
 allianceauth/services/modules/teamspeak3/tests.py  |  3 +--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/allianceauth/services/modules/discord/tasks.py b/allianceauth/services/modules/discord/tasks.py
index 9881aed8..74150219 100644
--- a/allianceauth/services/modules/discord/tasks.py
+++ b/allianceauth/services/modules/discord/tasks.py
@@ -89,7 +89,7 @@ def _task_perform_user_action(self, user_pk: int, method: str, **kwargs) -> None
                 bo,
                 bo.retry_after_seconds
             )
-            raise self.retry(exc=bo, countdown=bo.retry_after_seconds) from bo
+            raise self.retry(countdown=bo.retry_after_seconds) from bo
 
         except AttributeError as e:
             raise ValueError(f'{method} not a valid method for DiscordUser') from e
@@ -103,7 +103,7 @@ def _task_perform_user_action(self, user_pk: int, method: str, **kwargs) -> None
                 exc_info=True
             )
             if self.request.retries < DISCORD_TASKS_MAX_RETRIES:
-                raise self.retry(exc=e, countdown=DISCORD_TASKS_RETRY_PAUSE) from e
+                raise self.retry(countdown=DISCORD_TASKS_RETRY_PAUSE) from e
             else:
                 logger.error(
                     '%s failed for user %s after max retries',
@@ -202,9 +202,9 @@ def _task_perform_users_action(self, method: str, **kwargs) -> Any:
             bo,
             bo.retry_after_seconds
         )
-        raise self.retry(exc=bo, countdown=bo.retry_after_seconds) from bo
+        raise self.retry(countdown=bo.retry_after_seconds) from bo
 
-    except (HTTPError, ConnectionError)as e:
+    except (HTTPError, ConnectionError) as e:
         logger.warning(
             '%s failed, retrying in %d secs',
             method,
@@ -212,7 +212,7 @@ def _task_perform_users_action(self, method: str, **kwargs) -> Any:
             exc_info=True
         )
         if self.request.retries < DISCORD_TASKS_MAX_RETRIES:
-            raise self.retry(exc=e, countdown=DISCORD_TASKS_RETRY_PAUSE) from e
+            raise self.retry(countdown=DISCORD_TASKS_RETRY_PAUSE) from e
         else:
             logger.error('%s failed after max retries', method, exc_info=True)
 
diff --git a/allianceauth/services/modules/teamspeak3/models.py b/allianceauth/services/modules/teamspeak3/models.py
index 2cba2e06..c4b020f3 100644
--- a/allianceauth/services/modules/teamspeak3/models.py
+++ b/allianceauth/services/modules/teamspeak3/models.py
@@ -17,9 +17,10 @@ class Teamspeak3User(models.Model):
             ("access_teamspeak3", "Can access the Teamspeak3 service"),
         )
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.uid
 
+
 class TSgroup(models.Model):
     ts_group_id = models.IntegerField(primary_key=True)
     ts_group_name = models.CharField(max_length=30)
@@ -27,7 +28,7 @@ class TSgroup(models.Model):
     class Meta:
         verbose_name = 'TS Group'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.ts_group_name
 
 
@@ -38,7 +39,7 @@ class AuthTS(models.Model):
     class Meta:
         verbose_name = 'Auth / TS Group'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.auth_group.name
 
 
@@ -49,7 +50,7 @@ class UserTSgroup(models.Model):
     class Meta:
         verbose_name = 'User TS Group'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.user.name
 
 
@@ -57,5 +58,5 @@ class StateGroup(models.Model):
     state = models.ForeignKey(State, on_delete=models.CASCADE)
     ts_group = models.ForeignKey(TSgroup, on_delete=models.CASCADE)
 
-    def __str__(self):
-        return self.pk
+    def __str__(self) -> str:
+        return str(self.pk)
diff --git a/allianceauth/services/modules/teamspeak3/tests.py b/allianceauth/services/modules/teamspeak3/tests.py
index d6deb2ca..56a20847 100644
--- a/allianceauth/services/modules/teamspeak3/tests.py
+++ b/allianceauth/services/modules/teamspeak3/tests.py
@@ -116,8 +116,7 @@ class Teamspeak3HooksTestCase(TestCase):
         self.assertTrue(result)
         self.assertTrue(manager.return_value.__enter__.return_value.delete_user.called)
         with self.assertRaises(ObjectDoesNotExist):
-            _ = User.objects.get(username=self.member)
-
+            _ = User.objects.get(username=self.member).teamspeak3
 
     def test_render_services_ctrl(self):
         service = self.service()