Browse Source

ref: upgrade pytest and pytest-django (#64162)

<!-- Describe your PR here. -->
anthony sottile 1 year ago
parent
commit
4637b75d8a

+ 3 - 3
requirements-dev-frozen.txt

@@ -121,7 +121,7 @@ phonenumberslite==8.12.55
 pillow==10.0.1
 pip-tools==7.1.0
 platformdirs==2.5.2
-pluggy==0.13.1
+pluggy==1.4.0
 pre-commit==3.3.2
 progressbar2==3.41.0
 prompt-toolkit==3.0.41
@@ -140,9 +140,9 @@ pyjwt==2.4.0
 pymemcache==4.0.0
 pyparsing==3.0.9
 pysocks==1.7.1
-pytest==7.2.1
+pytest==8.0.0
 pytest-cov==4.0.0
-pytest-django==4.7.0
+pytest-django==4.8.0
 pytest-fail-slow==0.3.0
 pytest-rerunfailures==11.0
 pytest-sentry==0.1.11

+ 2 - 2
requirements-dev.txt

@@ -8,9 +8,9 @@ time-machine>=2.13.0
 honcho>=1.1.0
 openapi-core>=0.18.2
 psutil
-pytest>=7.2.1
+pytest>=8
 pytest-cov>=4.0.0
-pytest-django>=4.7.0
+pytest-django>=4.8.0
 pytest-fail-slow>=0.3.0
 pytest-rerunfailures>=11
 pytest-sentry>=0.1.11

+ 0 - 23
src/sentry/testutils/pytest/fixtures.py

@@ -156,7 +156,6 @@ def django_db_all(func=None, *, transaction=None, reset_sequences=None, **kwargs
     return decorator
 
 
-@pytest.mark.django_db
 @pytest.fixture
 def factories():
     # XXX(dcramer): hack to prevent recursive imports
@@ -192,12 +191,6 @@ def burst_task_runner():
     return BurstTaskRunner
 
 
-@pytest.fixture(scope="function")
-def session():
-    return factories.create_session()
-
-
-@pytest.mark.django_db
 @pytest.fixture(scope="function")
 def default_user(factories):
     """A default (super)user with email ``admin@localhost`` and password ``admin``.
@@ -207,7 +200,6 @@ def default_user(factories):
     return factories.create_user(email="admin@localhost", is_superuser=True)
 
 
-@pytest.mark.django_db
 @pytest.fixture(scope="function")
 def default_organization(factories, default_user):
     """A default organization (slug=``baz``) owned by the ``default_user`` fixture.
@@ -219,7 +211,6 @@ def default_organization(factories, default_user):
     return factories.create_organization(name="baz", slug="baz", owner=default_user)
 
 
-@pytest.mark.django_db
 @pytest.fixture(scope="function")
 def default_team(factories, default_organization):
     from sentry.models.organizationmember import OrganizationMember
@@ -233,41 +224,27 @@ def default_team(factories, default_organization):
     return team
 
 
-@pytest.mark.django_db
 @pytest.fixture(scope="function")
 def default_project(factories, default_team):
     return factories.create_project(name="Bar", slug="bar", teams=[default_team])
 
 
-@pytest.mark.django_db
 @pytest.fixture(scope="function")
 def default_projectkey(factories, default_project):
     return factories.create_project_key(project=default_project)
 
 
-@pytest.mark.django_db
 @pytest.fixture(scope="function")
 def default_environment(factories, default_project):
     return factories.create_environment(name="development", project=default_project)
 
 
-@pytest.mark.django_db
 @pytest.fixture(scope="function")
 def default_group(factories, default_project):
     # こんにちは konichiwa
     return factories.create_group(project=default_project, message="\u3053\u3093\u306b\u3061\u306f")
 
 
-@pytest.mark.django_db
-@pytest.fixture(scope="function")
-def default_event(factories, default_group):
-    return factories.store_event(
-        data={"event_id": "a" * 32, "message": "\u3053\u3093\u306b\u3061\u306f"},
-        project_id=default_project.id,
-    )
-
-
-@pytest.mark.django_db
 @pytest.fixture(scope="function")
 def default_activity(default_group, default_project, default_user):
     from sentry.models.activity import Activity

+ 0 - 1
tests/sentry/models/test_outbox.py

@@ -56,7 +56,6 @@ def wrap_with_connection_closure(c: Callable[..., Any]) -> Callable[..., Any]:
 
 
 @pytest.fixture(autouse=True, scope="function")
-@pytest.mark.django_db(transaction=True)
 def setup_clear_fixture_outbox_messages():
     with outbox_runner():
         pass