Fix tests and lint

src/registrar/models/portfolio.py

@@ -137,7 +137,6 @@ class Portfolio(TimeStampedModel):
 
         super().save(*args, **kwargs)
 
-
     @property
     def portfolio_type(self):
         """

src/registrar/models/user_portfolio_permission.py

@@ -77,7 +77,9 @@ class UserPortfolioPermission(TimeStampedModel):
     def __str__(self):
         readable_roles = []
         if self.roles:
-            readable_roles = sorted([UserPortfolioRoleChoices.get_user_portfolio_role_label(role) for role in self.roles])
+            readable_roles = sorted(
+                [UserPortfolioRoleChoices.get_user_portfolio_role_label(role) for role in self.roles]
+            )
         return f"{self.user}' " f"<Roles: {', '.join(readable_roles)}>" if self.roles else ""
 
     def get_readable_roles(self):
@@ -86,7 +88,7 @@ class UserPortfolioPermission(TimeStampedModel):
         for role in self.roles:
             role_labels.append(UserPortfolioRoleChoices.get_user_portfolio_role_label(role))
         return role_labels
-    
+
     def get_readable_additional_permissions(self):
         """Returns a list of labels of each additional_permission in self.additional_permissions"""
         perm_labels = []

src/registrar/models/utility/portfolio_helper.py

@@ -36,4 +36,4 @@ class UserPortfolioPermissionChoices(models.TextChoices):
 
     @classmethod
     def get_user_portfolio_permission_label(cls, user_portfolio_permission):
-        return cls(user_portfolio_permission).label if user_portfolio_permission else None
+        return cls(user_portfolio_permission).label if user_portfolio_permission else None

src/registrar/tests/test_admin.py

@@ -2098,24 +2098,28 @@ class TestPortfolioAdmin(TestCase):
 
         display_admins = self.admin.display_admins(self.portfolio)
 
+        url = reverse("admin:registrar_userportfoliopermission_change", args=[perm_1.pk])
         self.assertIn(
-            f'<a href="/admin/registrar/user/{perm_1.pk}/change/">Gerald Meoward meaoward@gov.gov</a>',
+            f'<a href="{url}">Gerald Meoward meaoward@gov.gov</a>',
             display_admins,
         )
         self.assertIn("Captain", display_admins)
-        self.assertIn(
-            f'<a href="/admin/registrar/user/{perm_2.pk}/change/">Arnold Poopy poopy@gov.gov</a>', display_admins
-        )
+
+        url = reverse("admin:registrar_userportfoliopermission_change", args=[perm_2.pk])
+        self.assertIn(f'<a href="{url}">Arnold Poopy poopy@gov.gov</a>', display_admins)
         self.assertIn("Major", display_admins)
 
         display_members_summary = self.admin.display_members_summary(self.portfolio)
 
+        url = reverse("admin:registrar_userportfoliopermission_change", args=[perm_3.pk])
         self.assertIn(
-            f'<a href="/admin/registrar/user/{perm_3.pk}/change/">Mad Max madmax@gov.gov</a>',
+            f'<a href="{url}">Mad Max madmax@gov.gov</a>',
             display_members_summary,
         )
+
+        url = reverse("admin:registrar_userportfoliopermission_change", args=[perm_4.pk])
         self.assertIn(
-            f'<a href="/admin/registrar/user/{perm_4.pk}/change/">Agent Smith thematrix@gov.gov</a>',
+            f'<a href="{url}">Agent Smith thematrix@gov.gov</a>',
             display_members_summary,
         )
 

src/registrar/tests/test_migrations.py

@@ -40,10 +40,17 @@ class TestGroups(TestCase):
             "add_federalagency",
             "change_federalagency",
             "delete_federalagency",
+            "add_portfolio",
+            "change_portfolio",
+            "delete_portfolio",
+            "add_suborganization",
+            "change_suborganization",
+            "delete_suborganization",
             "analyst_access_permission",
             "change_user",
             "delete_userdomainrole",
             "view_userdomainrole",
+            "view_userportfoliopermission",
             "add_verifiedbystaff",
             "change_verifiedbystaff",
             "delete_verifiedbystaff",