linting

src/registrar/tests/common.py

@@ -42,6 +42,7 @@ from registrar.models.user_domain_role import UserDomainRole
 from registrar.models.utility.contact_error import ContactError, ContactErrorCodes
 
 from api.tests.common import less_console_noise_decorator
+
 logger = logging.getLogger(__name__)
 
 
@@ -821,7 +822,6 @@ class MockDbForIndividualTests(MockDb):
         self.sharedTearDown()
 
 
-
 def mock_user():
     """A simple user."""
     user_kwargs = dict(
@@ -867,6 +867,7 @@ def create_user():
     user.groups.set([group])
     return user
 
+
 def create_test_user():
     username = "test_user"
     first_name = "First"
@@ -879,6 +880,7 @@ def create_test_user():
     )
     return user
 
+
 def create_ready_domain():
     domain, _ = Domain.objects.get_or_create(name="city.gov", state=Domain.State.READY)
     return domain

src/registrar/tests/test_admin.py

@@ -56,7 +56,7 @@ from .common import (
 )
 from django.contrib.sessions.backends.db import SessionStore
 from django.contrib.auth import get_user_model
-from unittest.mock import ANY, patch, Mock
+from unittest.mock import patch, Mock
 
 import logging
 
@@ -898,6 +898,7 @@ class TestUserDomainRoleAdmin(TestCase):
             fake_domain.delete()
             fake_user.delete()
 
+
 class TestListHeaderAdmin(TestCase):
     """Tests for the ListHeaderAdmin class as super user
 
@@ -1205,6 +1206,7 @@ class TestMyUserAdmin(MockDbForSharedTests):
         domain_request_ineligible.delete()
         domain_deleted.delete()
 
+
 class AuditedAdminTest(TestCase):
 
     @classmethod

src/registrar/tests/test_admin_domain.py

@@ -9,7 +9,6 @@ from registrar.admin import (
     DomainAdmin,
 )
 from registrar.models import (
-    Contact,
     Domain,
     DomainRequest,
     DomainInformation,
@@ -866,4 +865,3 @@ class TestDomainAdminWebTest(MockEppLib, WebTest):
     @skip("Waiting on epp lib to implement")
     def test_place_and_remove_hold_epp(self):
         raise
-

src/registrar/tests/test_admin_request.py

@@ -31,7 +31,7 @@ from .common import (
     MockEppLib,
     GenericTestHelper,
 )
-from unittest.mock import ANY, patch
+from unittest.mock import patch
 
 from django.conf import settings
 import boto3_mocking  # type: ignore
@@ -878,9 +878,7 @@ class TestDomainRequestAdmin(MockEppLib):
             DomainRequest.DomainRequestStatus.REJECTED,
             DomainRequest.RejectionReasons.SECOND_DOMAIN_REASONING,
         )
-        self.assert_email_is_accurate(
+        self.assert_email_is_accurate("Your domain request was rejected because Testorg has a .gov domain.", 0, EMAIL)
-            "Your domain request was rejected because Testorg has a .gov domain.", 0, EMAIL
-        )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
@@ -1226,7 +1224,7 @@ class TestDomainRequestAdmin(MockEppLib):
             last_name="Jones",
             email="meoward.jones@igorville.gov",
             phone="(555) 123 12345",
-            title = "Treat inspector"
+            title="Treat inspector",
         )
 
         # Create a fake domain request
@@ -1306,9 +1304,7 @@ class TestDomainRequestAdmin(MockEppLib):
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
 
         # Create a mock request
-        request = self.factory.post(
+        request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk), follow=True)
-            "/admin/registrar/domainrequest/{}/change/".format(domain_request.pk), follow=True
-        )
 
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
             # Modify the domain request's property
@@ -1350,9 +1346,7 @@ class TestDomainRequestAdmin(MockEppLib):
         self.assertContains(response, "Yes, select ineligible status")
 
         # Create a mock request
-        request = self.factory.post(
+        request = self.factory.post("/admin/registrar/domainrequest{}/change/".format(domain_request.pk), follow=True)
-            "/admin/registrar/domainrequest{}/change/".format(domain_request.pk), follow=True
-        )
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
             # Modify the domain request's property
             domain_request.status = DomainRequest.DomainRequestStatus.INELIGIBLE
@@ -1873,5 +1867,3 @@ class TestDomainRequestAdmin(MockEppLib):
 
         # Check if response contains expected_html
         self.assertIn(expected_html, response_content)
-
-

src/registrar/tests/test_emails.py

@@ -6,7 +6,7 @@ from django.test import TestCase
 from waffle.testutils import override_flag
 from registrar.utility import email
 from registrar.utility.email import send_templated_email
-from .common import completed_domain_request, less_console_noise
+from .common import completed_domain_request
 
 from api.tests.common import less_console_noise_decorator
 from datetime import datetime

src/registrar/tests/test_models.py

@@ -2,7 +2,6 @@ from django.test import TestCase
 from django.db.utils import IntegrityError
 from django.db import transaction
 from unittest.mock import patch
-from django.contrib.auth import get_user_model
 
 from django.test import RequestFactory
 
@@ -24,12 +23,19 @@ from registrar.models.transition_domain import TransitionDomain
 from registrar.models.verified_by_staff import VerifiedByStaff  # type: ignore
 from registrar.utility.constants import BranchChoices
 
-from .common import MockSESClient, less_console_noise, completed_domain_request, set_domain_request_investigators, create_test_user
+from .common import (
+    MockSESClient,
+    less_console_noise,
+    completed_domain_request,
+    set_domain_request_investigators,
+    create_test_user,
+)
 from django_fsm import TransitionNotAllowed
 from waffle.testutils import override_flag
 
 from api.tests.common import less_console_noise_decorator
 
+
 @boto3_mocking.patching
 class TestDomainRequest(TestCase):
     @less_console_noise_decorator

src/registrar/tests/test_reports.py

@@ -31,8 +31,7 @@ from .common import MockDbForSharedTests, MockDbForIndividualTests, MockEppLib,
 
 
 class CsvReportsTest(MockDbForSharedTests):
-    """Tests to determine if we are uploading our reports correctly.
+    """Tests to determine if we are uploading our reports correctly."""
-    """
 
     def setUp(self):
         """setup fake comain data"""
@@ -200,8 +199,7 @@ class CsvReportsTest(MockDbForSharedTests):
 
 
 class ExportDataTest(MockDbForIndividualTests, MockEppLib):
-    """Test the ExportData class from csv_export.
+    """Test the ExportData class from csv_export."""
-    """
 
     @less_console_noise_decorator
     def test_domain_data_type(self):

src/registrar/tests/test_views.py

@@ -121,9 +121,7 @@ class TestEnvironmentVariablesEffects(TestCase):
         fake_domain, _ = Domain.objects.get_or_create(name="igorville.gov")
 
         # Add a role
-        UserDomainRole.objects.get_or_create(
+        UserDomainRole.objects.get_or_create(user=self.user, domain=fake_domain, role=UserDomainRole.Roles.MANAGER)
-            user=self.user, domain=fake_domain, role=UserDomainRole.Roles.MANAGER
-        )
 
         with patch.object(DomainNameserversView, "get_initial", side_effect=self.side_effect_raise_value_error):
             with self.assertRaises(ValueError):
@@ -144,9 +142,7 @@ class TestEnvironmentVariablesEffects(TestCase):
         fake_domain, _ = Domain.objects.get_or_create(name="igorville.gov")
 
         # Add a role
-        UserDomainRole.objects.get_or_create(
+        UserDomainRole.objects.get_or_create(user=self.user, domain=fake_domain, role=UserDomainRole.Roles.MANAGER)
-            user=self.user, domain=fake_domain, role=UserDomainRole.Roles.MANAGER
-        )
 
         with patch.object(DomainNameserversView, "get_initial", side_effect=self.side_effect_raise_value_error):
             with self.assertRaises(ValueError):
@@ -228,7 +224,9 @@ class HomeTests(TestWithUser):
         test_domain.expiration_date = date(2011, 10, 10)
         test_domain.save()
 
-        test_role, _ = UserDomainRole.objects.get_or_create(user=self.user, domain=test_domain, role=UserDomainRole.Roles.MANAGER)
+        test_role, _ = UserDomainRole.objects.get_or_create(
+            user=self.user, domain=test_domain, role=UserDomainRole.Roles.MANAGER
+        )
 
         # Grab the json response of the domains list
         response = self.client.get("/get-domains-json/")
@@ -995,7 +993,9 @@ class PortfoliosTests(TestWithUser, WebTest):
             user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER
         )
         self.federal_agency = FederalAgency.objects.create()
-        self.portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="xyz inc", federal_agency=self.federal_agency)
+        self.portfolio, _ = Portfolio.objects.get_or_create(
+            creator=self.user, organization_name="xyz inc", federal_agency=self.federal_agency
+        )
 
     def tearDown(self):
         Portfolio.objects.all().delete()