Replace usage of TransactionTestCase (#1183)

Author: Swatinem

codecov/db/__init__.py

@@ -1,8 +1,6 @@
 import logging
 
-from asgiref.sync import SyncToAsync
 from django.conf import settings
-from django.db import close_old_connections
 from django.db.models import Field, Lookup
 
 log = logging.getLogger(__name__)
@@ -69,19 +67,3 @@ def as_sql(self, compiler, connection):
         rhs, rhs_params = self.process_rhs(compiler, connection)
         params = tuple(lhs_params) + tuple(rhs_params)
         return "%s is not %s" % (lhs, rhs), params
-
-
-class DatabaseSyncToAsync(SyncToAsync):
-    """
-    SyncToAsync version that cleans up old database connections.
-    """
-
-    def thread_handler(self, loop, *args, **kwargs):
-        close_old_connections()
-        try:
-            return super().thread_handler(loop, *args, **kwargs)
-        finally:
-            close_old_connections()
-
-
-sync_to_async = DatabaseSyncToAsync

codecov_auth/commands/owner/interactors/cancel_trial.py

@@ -1,8 +1,8 @@
+from asgiref.sync import sync_to_async
 from shared.plan.service import PlanService
 
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthorized, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.helpers import current_user_part_of_org
 from codecov_auth.models import Owner
 

codecov_auth/commands/owner/interactors/create_api_token.py

@@ -1,6 +1,7 @@
+from asgiref.sync import sync_to_async
+
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.models import Session
 
 

codecov_auth/commands/owner/interactors/create_stripe_setup_intent.py

@@ -1,10 +1,10 @@
 import logging
 
 import stripe
+from asgiref.sync import sync_to_async
 
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, Unauthorized, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.helpers import current_user_part_of_org
 from codecov_auth.models import Owner
 from services.billing import BillingService

codecov_auth/commands/owner/interactors/create_user_token.py

@@ -1,6 +1,7 @@
+from asgiref.sync import sync_to_async
+
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.models import UserToken
 
 

codecov_auth/commands/owner/interactors/delete_session.py

@@ -1,8 +1,8 @@
+from asgiref.sync import sync_to_async
 from django.contrib.sessions.models import Session as DjangoSession
 
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated
-from codecov.db import sync_to_async
 from codecov_auth.models import Session
 
 

codecov_auth/commands/owner/interactors/fetch_owner.py

@@ -1,5 +1,6 @@
+from asgiref.sync import sync_to_async
+
 from codecov.commands.base import BaseInteractor
-from codecov.db import sync_to_async
 from codecov_auth.models import Owner
 
 

codecov_auth/commands/owner/interactors/get_org_upload_token.py

@@ -1,6 +1,7 @@
+from asgiref.sync import sync_to_async
+
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, Unauthorized
-from codecov.db import sync_to_async
 from codecov_auth.helpers import current_user_part_of_org
 from codecov_auth.models import OrganizationLevelToken
 

codecov_auth/commands/owner/interactors/get_uploads_number_per_user.py

@@ -1,10 +1,10 @@
 from typing import Optional
 
+from asgiref.sync import sync_to_async
 from shared.plan.service import PlanService
 from shared.upload.utils import query_monthly_coverage_measurements
 
 from codecov.commands.base import BaseInteractor
-from codecov.db import sync_to_async
 from codecov_auth.models import Owner
 from services.redis_configuration import get_redis_connection
 

codecov_auth/commands/owner/interactors/is_syncing.py

@@ -1,5 +1,6 @@
+from asgiref.sync import sync_to_async
+
 from codecov.commands.base import BaseInteractor
-from codecov.db import sync_to_async
 from services.refresh import RefreshService
 
 

codecov_auth/commands/owner/interactors/onboard_user.py

@@ -1,8 +1,8 @@
+from asgiref.sync import sync_to_async
 from django import forms
 
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, Unauthorized, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.models import OwnerProfile
 
 

codecov_auth/commands/owner/interactors/regenerate_org_upload_token.py

@@ -1,8 +1,9 @@
 import uuid
 
+from asgiref.sync import sync_to_async
+
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, Unauthorized, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.helpers import current_user_part_of_org
 from codecov_auth.models import OrganizationLevelToken, Owner
 

codecov_auth/commands/owner/interactors/revoke_user_token.py

@@ -1,6 +1,7 @@
+from asgiref.sync import sync_to_async
+
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated
-from codecov.db import sync_to_async
 from codecov_auth.models import UserToken
 
 

codecov_auth/commands/owner/interactors/save_okta_config.py

@@ -1,10 +1,10 @@
 from dataclasses import dataclass
 
+from asgiref.sync import sync_to_async
 from shared.django_apps.codecov_auth.models import AccountsUsers, User
 
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, Unauthorized, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.models import Account, OktaSettings, Owner
 
 

codecov_auth/commands/owner/interactors/save_terms_agreement.py

@@ -1,11 +1,11 @@
 from dataclasses import dataclass
 from typing import Any, Optional
 
+from asgiref.sync import sync_to_async
 from django.utils import timezone
 
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, ValidationError
-from codecov.db import sync_to_async
 from services.analytics import AnalyticsService
 
 

codecov_auth/commands/owner/interactors/set_upload_token_required.py

@@ -1,8 +1,9 @@
 from dataclasses import dataclass
 
+from asgiref.sync import sync_to_async
+
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthenticated, Unauthorized, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.helpers import current_user_part_of_org
 from codecov_auth.models import Owner
 

codecov_auth/commands/owner/interactors/set_yaml_on_owner.py

@@ -2,6 +2,7 @@
 from typing import Optional
 
 import yaml
+from asgiref.sync import sync_to_async
 from shared.django_apps.core.models import Repository
 from shared.django_apps.utils.model_utils import get_ownerid_if_member
 from shared.validation.exceptions import InvalidYamlException
@@ -14,7 +15,6 @@
     Unauthorized,
     ValidationError,
 )
-from codecov.db import sync_to_async
 from codecov_auth.constants import OWNER_YAML_TO_STRING_KEY
 from codecov_auth.helpers import current_user_part_of_org
 from codecov_auth.models import Owner

codecov_auth/commands/owner/interactors/start_trial.py

@@ -1,8 +1,8 @@
+from asgiref.sync import sync_to_async
 from shared.plan.service import PlanService
 
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import Unauthorized, ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.helpers import current_user_part_of_org
 from codecov_auth.models import Owner
 

codecov_auth/commands/owner/interactors/store_codecov_metric.py

@@ -1,12 +1,12 @@
 import json
 
+from asgiref.sync import sync_to_async
 from shared.django_apps.codecov_metrics.service.codecov_metrics import (
     UserOnboardingMetricsService,
 )
 
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import ValidationError
-from codecov.db import sync_to_async
 from codecov_auth.models import Owner
 
 

codecov_auth/commands/owner/interactors/tests/test_cancel_trial.py

@@ -2,7 +2,7 @@
 
 import pytest
 from asgiref.sync import async_to_sync
-from django.test import TransactionTestCase
+from django.test import TestCase
 from freezegun import freeze_time
 from shared.django_apps.codecov.commands.exceptions import ValidationError
 from shared.django_apps.codecov_auth.tests.factories import PlanFactory, TierFactory
@@ -16,7 +16,7 @@
 from ..cancel_trial import CancelTrialInteractor
 
 
-class CancelTrialInteractorTest(TransactionTestCase):
+class CancelTrialInteractorTest(TestCase):
     def setUp(self):
         self.tier = TierFactory(tier_name=DEFAULT_FREE_PLAN)
         self.plan = PlanFactory(tier=self.tier)

codecov_auth/commands/owner/interactors/tests/test_create_api_token.py

@@ -1,13 +1,13 @@
 import pytest
-from django.test import TransactionTestCase
+from django.test import TestCase
 from shared.django_apps.core.tests.factories import OwnerFactory
 
 from codecov.commands.exceptions import Unauthenticated, ValidationError
 
 from ..create_api_token import CreateApiTokenInteractor
 
 
-class CreateApiTokenInteractorTest(TransactionTestCase):
+class CreateApiTokenInteractorTest(TestCase):
     def setUp(self):
         self.owner = OwnerFactory(username="codecov-user")
 

codecov_auth/commands/owner/interactors/tests/test_create_user_token.py

@@ -1,5 +1,5 @@
 import pytest
-from django.test import TransactionTestCase
+from django.test import TestCase
 from shared.django_apps.core.tests.factories import OwnerFactory
 
 from codecov.commands.exceptions import Unauthenticated, ValidationError
@@ -8,7 +8,7 @@
 from ..create_user_token import CreateUserTokenInteractor
 
 
-class CreateUserTokenInteractorTest(TransactionTestCase):
+class CreateUserTokenInteractorTest(TestCase):
     def setUp(self):
         self.owner = OwnerFactory(username="codecov-user")
 

codecov_auth/commands/owner/interactors/tests/test_delete_session.py

@@ -1,9 +1,9 @@
 import pytest
-from django.test import TransactionTestCase
+from asgiref.sync import sync_to_async
+from django.test import TestCase
 from shared.django_apps.codecov_auth.tests.factories import OwnerFactory, SessionFactory
 
 from codecov.commands.exceptions import Unauthenticated
-from codecov.db import sync_to_async
 from codecov_auth.models import DjangoSession, Session
 from codecov_auth.tests.factories import DjangoSessionFactory
 
@@ -15,7 +15,7 @@ def get_session(id):
     return Session.objects.get(sessionid=id)
 
 
-class DeleteSessionInteractorTest(TransactionTestCase):
+class DeleteSessionInteractorTest(TestCase):
     def setUp(self):
         self.owner = OwnerFactory(username="codecov-user")
         self.django_session = DjangoSessionFactory()

codecov_auth/commands/owner/interactors/tests/test_get_is_current_user_an_admin.py

@@ -1,7 +1,7 @@
 from unittest.mock import patch
 
 from asgiref.sync import async_to_sync
-from django.test import TransactionTestCase, override_settings
+from django.test import TestCase, override_settings
 from shared.django_apps.codecov_auth.tests.factories import (
     GetAdminProviderAdapter,
     OwnerFactory,
@@ -13,7 +13,7 @@
 )
 
 
-class GetIsCurrentUserAnAdminInteractorTest(TransactionTestCase):
+class GetIsCurrentUserAnAdminInteractorTest(TestCase):
     def setUp(self):
         self.owner_has_admins = OwnerFactory(ownerid=0, admins=[2])
         self.owner_has_no_admins = OwnerFactory(ownerid=1, admins=[])

codecov_auth/commands/owner/interactors/tests/test_get_org_upload_token.py

@@ -1,5 +1,5 @@
 import pytest
-from django.test import TransactionTestCase
+from django.test import TestCase
 from shared.django_apps.codecov_auth.tests.factories import (
     OrganizationLevelTokenFactory,
     OwnerFactory,
@@ -10,7 +10,7 @@
 from ..get_org_upload_token import GetOrgUploadToken
 
 
-class GetOrgUploadTokenInteractorTest(TransactionTestCase):
+class GetOrgUploadTokenInteractorTest(TestCase):
     def setUp(self):
         self.owner_with_no_upload_token = OwnerFactory()
         self.owner_with_upload_token = OwnerFactory(plan="users-enterprisem")

codecov_auth/commands/owner/interactors/tests/test_get_uploads_number_per_user.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 
-from django.test import TransactionTestCase
+from django.test import TestCase
 from shared.django_apps.codecov_auth.tests.factories import PlanFactory, TierFactory
 from shared.django_apps.core.tests.factories import (
     CommitFactory,
@@ -16,7 +16,7 @@
 from ..get_uploads_number_per_user import GetUploadsNumberPerUserInteractor
 
 
-class GetUploadsNumberPerUserInteractorTest(TransactionTestCase):
+class GetUploadsNumberPerUserInteractorTest(TestCase):
     def setUp(self):
         self.tier = TierFactory(tier_name=TierName.BASIC.value)
         self.plan = PlanFactory(tier=self.tier, monthly_uploads_limit=250)

codecov_auth/commands/owner/interactors/tests/test_is_syncing.py

@@ -1,13 +1,13 @@
 from unittest.mock import patch
 
 from asgiref.sync import async_to_sync
-from django.test import TransactionTestCase
+from django.test import TestCase
 from shared.django_apps.core.tests.factories import OwnerFactory
 
 from ..is_syncing import IsSyncingInteractor
 
 
-class IsSyncingInteractorTest(TransactionTestCase):
+class IsSyncingInteractorTest(TestCase):
     def setUp(self):
         self.owner = OwnerFactory(username="codecov-user")
 

codecov_auth/commands/owner/interactors/tests/test_onboard_user.py

@@ -1,13 +1,13 @@
 import pytest
-from django.test import TransactionTestCase
+from django.test import TestCase
 from shared.django_apps.core.tests.factories import OwnerFactory
 
 from codecov.commands.exceptions import Unauthenticated, Unauthorized, ValidationError
 from codecov_auth.commands.owner.interactors.onboard_user import OnboardUserInteractor
 from codecov_auth.models import OwnerProfile
 
 
-class OnboardUserInteractorTest(TransactionTestCase):
+class OnboardUserInteractorTest(TestCase):
     def setUp(self):
         self.owner = OwnerFactory(username="codecov-user")
         self.already_onboarded_owner = OwnerFactory(

codecov_auth/commands/owner/interactors/tests/test_regenerate_org_upload_token.py

@@ -1,13 +1,13 @@
 import pytest
-from django.test import TransactionTestCase
+from django.test import TestCase
 from shared.django_apps.core.tests.factories import OwnerFactory
 
 from codecov.commands.exceptions import Unauthenticated, Unauthorized, ValidationError
 
 from ..regenerate_org_upload_token import RegenerateOrgUploadTokenInteractor
 
 
-class RegenerateOrgUploadTokenInteractorTest(TransactionTestCase):
+class RegenerateOrgUploadTokenInteractorTest(TestCase):
     def setUp(self):
         self.random_user = OwnerFactory()
         self.owner = OwnerFactory(username="codecovv", plan="users-enterprisem")