Skip to content

Commit 0b32ac2

Browse files
authored
Revert "chore(ci): move IAST leak testing to riot" (#13596)
Reverts #13544 Looks like it could randonmly be slower on riot for some reason. ## Checklist - [X] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
1 parent a68016f commit 0b32ac2

File tree

8 files changed

+33
-128
lines changed

8 files changed

+33
-128
lines changed

.riot/requirements/6780b6b.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.

.riot/requirements/73136d3.txt

Lines changed: 0 additions & 36 deletions
This file was deleted.

.riot/requirements/ba34840.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.

hatch.toml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,37 @@ fastapi = ["==0.94.1"]
627627
python = ["3.8", "3.10", "3.13"]
628628
fastapi = ["~=0.114.2"]
629629

630+
## ASM Appsec Aggregated Leak Testing
631+
632+
[envs.iast_aggregated_leak_testing]
633+
template = "iast_aggregated_leak_testing"
634+
dependencies = [
635+
"pytest",
636+
"pytest-cov",
637+
"hypothesis",
638+
"requests",
639+
"pytest-asyncio",
640+
"anyio",
641+
"pydantic",
642+
"pydantic-settings",
643+
]
644+
645+
[envs.iast_aggregated_leak_testing.env-vars]
646+
DD_IAST_ENABLED = "true"
647+
_DD_IAST_PATCH_MODULES = "benchmarks.,tests.appsec.,scripts.iast."
648+
DD_FAST_BUILD = "0"
649+
650+
[envs.iast_aggregated_leak_testing.scripts]
651+
test = [
652+
"uname -a",
653+
"pip freeze",
654+
# We use --no-cov due to a pytest-cov problem with eval https://github.com/pytest-dev/pytest-cov/issues/676
655+
"python -m pytest --no-cov tests/appsec/iast_aggregated_memcheck/test_aggregated_memleaks.py",
656+
]
657+
658+
[[envs.iast_aggregated_leak_testing.matrix]]
659+
python = ["3.10", "3.11", "3.12"]
660+
630661
## pytorch profiling test
631662

632663
[envs.profiling_pytorch]

lib-injection/sources/min_compatible_versions.csv

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@ psycopg,0
132132
psycopg2-binary,~=2.8.0
133133
py-cpuinfo,~=8.0.0
134134
pycryptodome,0
135-
pydantic,0
136-
pydantic-settings,0
137135
pyfakefs,0
138136
pylibmc,~=1.6.2
139137
pymemcache,~=3.4.2

min_compatible_versions.csv

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@ psycopg,0
132132
psycopg2-binary,~=2.8.0
133133
py-cpuinfo,~=8.0.0
134134
pycryptodome,0
135-
pydantic,0
136-
pydantic-settings,0
137135
pyfakefs,0
138136
pylibmc,~=1.6.2
139137
pymemcache,~=3.4.2

riotfile.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -144,24 +144,6 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
144144
"DD_IAST_REQUEST_SAMPLING": "100",
145145
},
146146
),
147-
Venv(
148-
name="iast_aggregated_leak_testing",
149-
pys=["3.10", "3.11", "3.12"],
150-
# We use --no-cov due to a pytest-cov problem with eval https://github.com/pytest-dev/pytest-cov/issues/676
151-
command="pytest --no-cov {cmdargs} tests/appsec/iast_aggregated_memcheck/test_aggregated_memleaks.py",
152-
pkgs={
153-
"requests": latest,
154-
"pytest-asyncio": latest,
155-
"anyio": latest,
156-
"pydantic": latest,
157-
"pydantic-settings": latest,
158-
},
159-
env={
160-
"DD_IAST_ENABLED": "true",
161-
"_DD_IAST_PATCH_MODULES": "benchmarks.,tests.appsec.,scripts.iast.",
162-
"DD_FAST_BUILD": "0",
163-
},
164-
),
165147
Venv(
166148
name="profile-diff",
167149
command="python scripts/diff.py {cmdargs}",

tests/appsec/suitespec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ suites:
7070
paths:
7171
- '@appsec_iast'
7272
- tests/appsec/iast_aggregated_memcheck/*
73-
runner: riot
74-
timeout: 60m
73+
runner: hatch
74+
timeout: 50m
7575
appsec_iast_packages:
7676
paths:
7777
- '@appsec_iast'

0 commit comments

Comments
 (0)