[python] Enable more user event tests (#3935)

DataDog · Jan 31, 2025 · 9ce636f · 9ce636f
1 parent 8519bfb
commit 9ce636f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/manifests/python.yml b/manifests/python.yml
@@ -455,8 +455,8 @@ tests/:
       Test_V3_Login_Events_RC: v2.11.0
     test_automated_user_and_session_tracking.py:
       Test_Automated_Session_Blocking: missing_feature
-      Test_Automated_User_Blocking: missing_feature
-      Test_Automated_User_Tracking: missing_feature
+      Test_Automated_User_Blocking: v2.21.0.dev
+      Test_Automated_User_Tracking: v2.21.0.dev
     test_blocking_addresses.py:
       Test_BlockingGraphqlResolvers: missing_feature
       Test_Blocking_client_ip:

diff --git a/tests/appsec/test_automated_user_and_session_tracking.py b/tests/appsec/test_automated_user_and_session_tracking.py
@@ -5,6 +5,7 @@
 from utils import context
 from utils import features
 from utils import interfaces
+from utils import irrelevant
 from utils import remote_config as rc
 from utils import rfc
 from utils import scenarios
@@ -51,6 +52,10 @@ def setup_user_tracking_auto(self):
             cookies=self.r_login.cookies,
         )
 
+    @irrelevant(
+        context.library == "python" and context.weblog_variant not in ["django-poc", "python3.12", "django-py3.13"],
+        reason="no possible auto-instrumentation for python except on Django",
+    )
     def test_user_tracking_auto(self):
         assert self.r_login.status_code == 200
 
@@ -161,6 +166,10 @@ def setup_user_blocking_auto(self):
             cookies=self.r_login.cookies,
         )
 
+    @irrelevant(
+        context.library == "python" and context.weblog_variant not in ["django-poc", "python3.12", "django-py3.13"],
+        reason="no possible auto-instrumentation for python except on Django",
+    )
     def test_user_blocking_auto(self):
         assert self.config_state_1[rc.RC_STATE] == rc.ApplyState.ACKNOWLEDGED
         assert self.r_login.status_code == 200

diff --git a/utils/build/docker/python/django/django_app/settings.py b/utils/build/docker/python/django/django_app/settings.py
@@ -119,3 +119,5 @@
     },
     "root": {"handlers": ["console"], "level": "ERROR"},
 }
+
+SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
diff --git a/utils/scripts/load-binary.sh b/utils/scripts/load-binary.sh
@@ -185,7 +185,7 @@ elif [ "$TARGET" = "dotnet" ]; then
 elif [ "$TARGET" = "python" ]; then
     assert_version_is_dev
 
-    TARGET_BRANCH="${TARGET_BRANCH:-main}"
+    TARGET_BRANCH="${TARGET_BRANCH:-3.x-staging}"
     echo "git+https://github.com/DataDog/dd-trace-py.git@$TARGET_BRANCH" > python-load-from-pip
     echo "Using $(cat python-load-from-pip)"
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,3 +119,5 @@ @@
         },
         "root": {"handlers": ["console"], "level": "ERROR"},
     }
+    SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"