Browse Source

ref(py): Sort imports in testutils (#25024)

Evan Purkhiser 3 years ago
parent
commit
cee5449fd4

+ 1 - 1
src/sentry/testutils/__init__.py

@@ -1,4 +1,4 @@
 from .asserts import *  # NOQA
 from .cases import *  # NOQA
-from .skips import *  # NOQA
 from .relay import *  # NOQA
+from .skips import *  # NOQA

+ 28 - 31
src/sentry/testutils/cases.py

@@ -20,62 +20,56 @@ __all__ = (
     "OrganizationDashboardWidgetTestCase",
 )
 
+import inspect
 import os
 import os.path
-import pytest
-import requests
 import time
-import inspect
-from uuid import uuid4
 from contextlib import contextmanager
-from sentry.utils.compat import mock
+from datetime import datetime
+from urllib.parse import urlencode
+from uuid import uuid4
 
+import pytest
+import requests
 from click.testing import CliRunner
-from datetime import datetime
 from django.conf import settings
 from django.contrib.auth import login
 from django.contrib.auth.models import AnonymousUser
 from django.core import signing
 from django.core.cache import cache
 from django.core.urlresolvers import reverse
-from django.db import connections, DEFAULT_DB_ALIAS
+from django.db import DEFAULT_DB_ALIAS, connections
 from django.http import HttpRequest
-from django.test import override_settings, TestCase, TransactionTestCase
+from django.test import TestCase, TransactionTestCase, override_settings
 from django.test.utils import CaptureQueriesContext
 from django.utils import timezone
 from django.utils.functional import cached_property
-
-from exam import before, fixture, Exam
-from sentry.utils.compat.mock import patch
+from exam import Exam, before, fixture
 from pkg_resources import iter_entry_points
 from rest_framework.test import APITestCase as BaseAPITestCase
-from urllib.parse import urlencode
 
-from sentry import auth
-from sentry import eventstore
+from sentry import auth, eventstore
 from sentry.auth.authenticators import TotpInterface
 from sentry.auth.providers.dummy import DummyProvider
-from sentry.auth.superuser import (
-    Superuser,
-    COOKIE_SALT as SU_COOKIE_SALT,
-    COOKIE_NAME as SU_COOKIE_NAME,
-    ORG_ID as SU_ORG_ID,
-    COOKIE_SECURE as SU_COOKIE_SECURE,
-    COOKIE_DOMAIN as SU_COOKIE_DOMAIN,
-    COOKIE_PATH as SU_COOKIE_PATH,
-)
+from sentry.auth.superuser import COOKIE_DOMAIN as SU_COOKIE_DOMAIN
+from sentry.auth.superuser import COOKIE_NAME as SU_COOKIE_NAME
+from sentry.auth.superuser import COOKIE_PATH as SU_COOKIE_PATH
+from sentry.auth.superuser import COOKIE_SALT as SU_COOKIE_SALT
+from sentry.auth.superuser import COOKIE_SECURE as SU_COOKIE_SECURE
+from sentry.auth.superuser import ORG_ID as SU_ORG_ID
+from sentry.auth.superuser import Superuser
 from sentry.constants import MODULE_ROOT
 from sentry.eventstream.snuba import SnubaEventStream
 from sentry.models import (
-    GroupMeta,
-    ProjectOption,
-    Repository,
-    DeletedOrganization,
-    Organization,
     Dashboard,
-    DashboardWidgetQuery,
     DashboardWidget,
     DashboardWidgetDisplayTypes,
+    DashboardWidgetQuery,
+    DeletedOrganization,
+    GroupMeta,
+    Organization,
+    ProjectOption,
+    Repository,
 )
 from sentry.plugins.base import plugins
 from sentry.rules import EventState
@@ -83,14 +77,17 @@ from sentry.tagstore.snuba import SnubaTagStorage
 from sentry.testutils.helpers.datetime import iso_format
 from sentry.utils import json
 from sentry.utils.auth import SSO_SESSION_KEY
+from sentry.utils.compat import mock
+from sentry.utils.compat.mock import patch
 from sentry.utils.pytest.selenium import Browser
 from sentry.utils.retries import TimedRetryPolicy
 from sentry.utils.snuba import _snuba_pool
+
 from . import assert_status_code
-from .fixtures import Fixtures
 from .factories import Factories
-from .skips import requires_snuba
+from .fixtures import Fixtures
 from .helpers import AuthProvider, Feature, TaskRunner, override_options, parse_queries
+from .skips import requires_snuba
 
 DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"
 

+ 27 - 28
src/sentry/testutils/factories.py

@@ -1,23 +1,22 @@
-from django.conf import settings
-
 import io
 import os
-import petname
 import random
 import warnings
 from binascii import hexlify
 from hashlib import sha1
-from uuid import uuid4
 from importlib import import_module
+from uuid import uuid4
 
+import petname
+from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 from django.db import transaction
 from django.utils import timezone
-from django.utils.text import slugify
 from django.utils.encoding import force_text
+from django.utils.text import slugify
 
+from sentry.constants import SentryAppInstallationStatus, SentryAppStatus
 from sentry.event_manager import EventManager
-from sentry.constants import SentryAppStatus, SentryAppInstallationStatus
 from sentry.incidents.logic import (
     create_alert_rule,
     create_alert_rule_trigger,
@@ -27,56 +26,56 @@ from sentry.incidents.models import (
     AlertRuleThresholdType,
     AlertRuleTriggerAction,
     Incident,
-    IncidentTrigger,
     IncidentActivity,
     IncidentProject,
     IncidentSeen,
+    IncidentTrigger,
     IncidentType,
     TriggerStatus,
 )
 from sentry.mediators import (
-    sentry_apps,
-    sentry_app_installations,
     sentry_app_installation_tokens,
+    sentry_app_installations,
+    sentry_apps,
     service_hooks,
 )
 from sentry.models import (
     Activity,
+    Commit,
+    CommitAuthor,
+    CommitFileChange,
     Environment,
+    EventAttachment,
+    ExternalIssue,
+    ExternalTeam,
+    ExternalUser,
+    File,
     Group,
+    GroupLink,
     Organization,
     OrganizationMember,
     OrganizationMemberTeam,
+    PlatformExternalIssue,
     Project,
     ProjectBookmark,
-    Team,
-    User,
-    UserEmail,
+    ProjectCodeOwners,
+    ProjectDebugFile,
     Release,
-    Commit,
     ReleaseCommit,
-    CommitAuthor,
-    Repository,
-    CommitFileChange,
-    ProjectDebugFile,
-    File,
-    UserPermission,
-    EventAttachment,
-    UserReport,
-    PlatformExternalIssue,
-    ExternalIssue,
-    GroupLink,
     ReleaseFile,
+    Repository,
     RepositoryProjectPathConfig,
     Rule,
-    ExternalUser,
-    ExternalTeam,
-    ProjectCodeOwners,
+    Team,
+    User,
+    UserEmail,
+    UserPermission,
+    UserReport,
 )
 from sentry.models.integrationfeature import Feature, IntegrationFeature
 from sentry.signals import project_created
 from sentry.snuba.models import QueryDatasets
-from sentry.utils import loremipsum, json
+from sentry.utils import json, loremipsum
 
 
 def get_fixture_path(name):

+ 3 - 3
src/sentry/testutils/fixtures.py

@@ -1,8 +1,8 @@
-from sentry.models import Activity, OrganizationMember, OrganizationMemberTeam
-from sentry.incidents.models import IncidentActivityType
-
 import pytest
 from django.utils.functional import cached_property
+
+from sentry.incidents.models import IncidentActivityType
+from sentry.models import Activity, OrganizationMember, OrganizationMemberTeam
 from sentry.testutils.factories import Factories
 from sentry.testutils.helpers.datetime import before_now, iso_format
 

+ 1 - 1
src/sentry/testutils/helpers/__init__.py

@@ -2,7 +2,7 @@ from .auth_header import *  # NOQA
 from .auth_providers import *  # NOQA
 from .features import *  # NOQA
 from .link_header import *  # NOQA
-from .task_runner import *  # NOQA
 from .options import *  # NOQA
 from .query import *  # NOQA
 from .socket import *  # NOQA
+from .task_runner import *  # NOQA

+ 1 - 0
src/sentry/testutils/helpers/auth_providers.py

@@ -1,6 +1,7 @@
 __all__ = ["AuthProvider"]
 
 from contextlib import contextmanager
+
 from sentry.auth import register, unregister
 
 

+ 1 - 1
src/sentry/testutils/helpers/datetime.py

@@ -1,5 +1,5 @@
-from datetime import datetime, timedelta
 import time
+from datetime import datetime, timedelta
 
 from django.utils import timezone
 

+ 1 - 0
src/sentry/testutils/helpers/features.py

@@ -2,6 +2,7 @@ __all__ = ["Feature", "with_feature"]
 
 import collections
 from contextlib import contextmanager
+
 from sentry.utils.compat.mock import patch
 
 

+ 4 - 1
src/sentry/testutils/helpers/options.py

@@ -1,7 +1,9 @@
 __all__ = ["override_options"]
 
-from django.test.utils import override_settings
 from contextlib import contextmanager
+
+from django.test.utils import override_settings
+
 from sentry.utils.compat.mock import patch
 
 
@@ -12,6 +14,7 @@ def override_options(options):
     Options.
     """
     from django.conf import settings
+
     from sentry.options import default_manager
 
     wrapped = default_manager.store.get

+ 0 - 2
src/sentry/testutils/helpers/query.py

@@ -1,8 +1,6 @@
 import sqlparse
-
 from sqlparse.tokens import DML
 
-
 __all__ = ("parse_queries",)
 
 

Some files were not shown because too many files changed in this diff