Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions riotfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
"psutil": "==7.1.3",
},
env={
"DDTEST_SUITE_PATH": "tests/appsec/integrations/django_tests",
"DDTEST_TESTS_LOCATION": "tests/appsec/integrations/django_tests/**/test*.py",
"DD_TRACE_AGENT_URL": "http://testagent:9126",
"_DD_IAST_PATCH_MODULES": "benchmarks.,tests.appsec.",
"DD_IAST_REQUEST_SAMPLING": "100",
Expand Down Expand Up @@ -3340,9 +3342,11 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
Venv(
name="mistralai",
env={
"DDTEST_SUITE_PATH": "tests/contrib/mistralai",
"DDTEST_TESTS_LOCATION": "tests/contrib/mistralai/**/test*.py",
"DD_TRACE_PY_ENABLE_ITR_TEST_SKIPPING_FOR_JOB": "true",
},
command="pytest {cmdargs} tests/contrib/mistralai",
command="pytest {cmdargs} ${{DDTEST_SUITE_PATH}}",
pys=select_pys(min_version="3.10"),
pkgs={
"pytest-asyncio": latest,
Expand Down Expand Up @@ -3839,8 +3843,10 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
Venv(
name="profile",
# NB riot commands that use this Venv must include --pass-env to work properly
command="python -m tests.profiling.run pytest -v --no-cov --capture=no --benchmark-disable --ignore='tests/profiling/collector/test_memalloc.py' --ignore='tests/profiling/test_memalloc_fork.py' {cmdargs} tests/profiling", # noqa: E501
command="python -m tests.profiling.run pytest -v --no-cov --capture=no --benchmark-disable --ignore='tests/profiling/collector/test_memalloc.py' --ignore='tests/profiling/test_memalloc_fork.py' {cmdargs} ${{DDTEST_SUITE_PATH}}", # noqa: E501
env={
"DDTEST_SUITE_PATH": "tests/profiling",
"DDTEST_TESTS_LOCATION": "tests/profiling/**/test*.py",
"DD_PROFILING_ENABLE_ASSERTS": "1",
"DD_PROFILING_MEMALLOC_ASSERT_ON_REENTRY": "1",
"CPUCOUNT": "12",
Expand Down Expand Up @@ -4456,7 +4462,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
),
Venv(
name="appsec_threats_fastapi_iast",
command="pytest tests/appsec/contrib_appsec/test_fastapi.py::Test_FastAPI {cmdargs}",
command="pytest ${{DDTEST_SUITE_PATH}} {cmdargs}",
pkgs={
"pytest": latest,
"pytest-cov": latest,
Expand All @@ -4465,6 +4471,9 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
"httpx": "<0.28.0",
},
env={
"DDTEST_SUITE_PATH": "tests/appsec/contrib_appsec/test_fastapi.py::Test_FastAPI",
"DDTEST_TESTS_LOCATION": "tests/appsec/contrib_appsec/test_fastapi.py",
"DDTEST_PYTEST_ADDOPTS": "-k 'Test_FastAPI and not Test_FastAPI_RC'",
"DD_TRACE_AGENT_URL": "http://testagent:9126",
"AGENT_VERSION": "testagent",
"DD_IAST_DEDUPLICATION_ENABLED": "false",
Expand Down
10 changes: 10 additions & 0 deletions tests/appsec/suitespec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ suites:
- testagent
timeout: 40m
appsec_integrations_django:
ddtest: true
ddtest_nodes: 2
env:
_DD_PYTEST_XDIST_INFERRED_SERVICE: tests.appsec.integrations.django_tests
venvs_per_job: 1
paths:
- '@bootstrap'
Expand Down Expand Up @@ -262,7 +266,13 @@ suites:
- tests/appsec/contrib_appsec/*
retry: 2
appsec_threats_fastapi_iast:
ddtest: true
env:
_DD_PYTEST_XDIST_INFERRED_SERVICE: tests.appsec.contrib_appsec
ddtest_nodes: 2
venvs_per_job: 1
services:
- testagent
paths:
- '@bootstrap'
- '@core'
Expand Down
4 changes: 4 additions & 0 deletions tests/llmobs/suitespec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ suites:
snapshot: true
venvs_per_job: 5
mistralai:
ddtest: true
ddtest_nodes: 2
env:
_DD_PYTEST_XDIST_INFERRED_SERVICE: tests.contrib.mistralai
parallelism: 1
paths:
- '@bootstrap'
Expand Down
3 changes: 3 additions & 0 deletions tests/profiling/suitespec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ components:
- ddtrace/internal/settings/profiling.py
suites:
profile:
ddtest: true
ddtest_nodes: 2
env:
_DD_PYTEST_XDIST_INFERRED_SERVICE: tests.profiling
DD_TRACE_AGENT_URL: ''
venvs_per_job: 1
paths:
Expand Down
Loading