From 3176ddec65538b1b03b3e32c5b790e16b64fbe0f Mon Sep 17 00:00:00 2001 From: Ivana Kellyerova Date: Tue, 24 Oct 2023 13:44:46 +0200 Subject: [PATCH] Add Django 4.2 to test suite (#2462) --- tests/integrations/django/test_basic.py | 9 +++++---- tox.ini | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py index e599c78843..08fdf37eaf 100644 --- a/tests/integrations/django/test_basic.py +++ b/tests/integrations/django/test_basic.py @@ -647,10 +647,11 @@ def test_db_connection_span_data(sentry_init, client, capture_events): if span.get("op") == "db": data = span.get("data") assert data.get(SPANDATA.DB_SYSTEM) == "postgresql" - assert ( - data.get(SPANDATA.DB_NAME) - == connections["postgres"].get_connection_params()["database"] - ) + conn_params = connections["postgres"].get_connection_params() + assert data.get(SPANDATA.DB_NAME) is not None + assert data.get(SPANDATA.DB_NAME) == conn_params.get( + "database" + ) or conn_params.get("dbname") assert data.get(SPANDATA.SERVER_ADDRESS) == os.environ.get( "SENTRY_PYTHON_TEST_POSTGRES_HOST", "localhost" ) diff --git a/tox.ini b/tox.ini index 2f082b8d58..7a212561b9 100644 --- a/tox.ini +++ b/tox.ini @@ -75,7 +75,7 @@ envlist = {py3.6,py3.7,py3.8,py3.9}-django-v{3.0,3.1} {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-django-v{3.2} # - Django 4.x - {py3.8,py3.9,py3.10,py3.11}-django-v{4.0,4.1} + {py3.8,py3.9,py3.10,py3.11}-django-v{4.0,4.1,4.2} # Falcon {py2.7,py3.5,py3.6,py3.7}-falcon-v{1.4} @@ -289,10 +289,10 @@ deps = django-v{2.2,3.0,3.1,3.2}: pytest-django>=4.0 django-v{2.2,3.0,3.1,3.2}: Werkzeug<2.0 - django-v{4.0,4.1}: djangorestframework - django-v{4.0,4.1}: pytest-asyncio - django-v{4.0,4.1}: pytest-django - django-v{4.0,4.1}: Werkzeug + django-v{4.0,4.1,4.2}: djangorestframework + django-v{4.0,4.1,4.2}: pytest-asyncio + django-v{4.0,4.1,4.2}: pytest-django + django-v{4.0,4.1,4.2}: Werkzeug django-v1.8: Django>=1.8,<1.9 django-v1.9: Django>=1.9,<1.10 @@ -306,6 +306,7 @@ deps = django-v3.2: Django>=3.2,<3.3 django-v4.0: Django>=4.0,<4.1 django-v4.1: Django>=4.1,<4.2 + django-v4.2: Django>=4.2,<4.3 # Falcon falcon-v1.4: falcon>=1.4,<1.5