diff --git a/tests/appsec/api_security/test_schemas.py b/tests/appsec/api_security/test_schemas.py index fbbb2206206..cb7e85cf0fe 100644 --- a/tests/appsec/api_security/test_schemas.py +++ b/tests/appsec/api_security/test_schemas.py @@ -2,7 +2,7 @@ # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2021 Datadog, Inc. -from utils import context, interfaces, missing_feature, rfc, scenarios, weblog, features, logger, flaky, bug +from utils import context, interfaces, missing_feature, rfc, scenarios, weblog, features, logger, flaky from utils._weblog import HttpResponse from types import EllipsisType @@ -263,7 +263,6 @@ def setup_request_method(self): headers={"user-agent": "dd-test-scanner-log-block"}, ) - @bug(context.library >= "python_lambda@8.117.0", reason="APPSEC-60014") def test_request_method(self): """Can provide response body schema""" assert self.request_noblock.status_code == 200 @@ -320,7 +319,6 @@ def setup_request_method(self): ) @missing_feature(context.library < "python@1.19.0.dev") - @bug(context.library >= "python_lambda@8.117.0", reason="APPSEC-60014") def test_request_method(self): """Can provide request header schema""" schema_cookies = get_schema(self.request, "req.cookies") diff --git a/tests/appsec/rasp/test_api10.py b/tests/appsec/rasp/test_api10.py index 7f91423627d..069ec62dc0b 100644 --- a/tests/appsec/rasp/test_api10.py +++ b/tests/appsec/rasp/test_api10.py @@ -4,20 +4,14 @@ import json import urllib.parse -import pytest -from utils import features, weblog, interfaces, scenarios, rfc, context +from utils import features, weblog, interfaces, scenarios, rfc from tests.appsec.rasp.utils import ( find_series, validate_metric_variant_v2, ) -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] API10_TAGS = [ "_dd.appsec.trace.req_headers", diff --git a/tests/appsec/rasp/test_cmdi.py b/tests/appsec/rasp/test_cmdi.py index b0b16daa00f..f7a4a5f0962 100644 --- a/tests/appsec/rasp/test_cmdi.py +++ b/tests/appsec/rasp/test_cmdi.py @@ -2,7 +2,6 @@ # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2021 Datadog, Inc. -import pytest from utils import features, weblog, interfaces, scenarios, rfc, context from utils.dd_constants import Capabilities @@ -16,12 +15,6 @@ BaseWAFVersion, ) -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - @rfc("https://docs.google.com/document/d/1DDWy3frMXDTAbk-BfnZ1FdRwuPx6Pl7AWyR4zjqRFZw") @features.rasp_command_injection diff --git a/tests/appsec/rasp/test_lfi.py b/tests/appsec/rasp/test_lfi.py index b87d1ce355b..6f1978a8189 100644 --- a/tests/appsec/rasp/test_lfi.py +++ b/tests/appsec/rasp/test_lfi.py @@ -2,7 +2,6 @@ # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2021 Datadog, Inc. -import pytest from utils import features, weblog, interfaces, scenarios, rfc, context from utils import remote_config as rc @@ -19,13 +18,6 @@ ) -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - - @rfc("https://docs.google.com/document/d/1vmMqpl8STDk7rJnd3YBsa6O9hCls_XHHdsodD61zr_4/edit#heading=h.3nydvvu7sn93") @features.rasp_local_file_inclusion @scenarios.appsec_rasp diff --git a/tests/appsec/rasp/test_shi.py b/tests/appsec/rasp/test_shi.py index b1d5ddc882b..b65b7861dcd 100644 --- a/tests/appsec/rasp/test_shi.py +++ b/tests/appsec/rasp/test_shi.py @@ -2,7 +2,6 @@ # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2021 Datadog, Inc. -import pytest from utils import features, weblog, interfaces, scenarios, rfc, context from utils.dd_constants import Capabilities @@ -17,12 +16,6 @@ BaseWAFVersion, ) -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - class Test_Shi_Base: def get_shell_value(self): diff --git a/tests/appsec/rasp/test_sqli.py b/tests/appsec/rasp/test_sqli.py index 03f5300320d..a20f3f860c9 100644 --- a/tests/appsec/rasp/test_sqli.py +++ b/tests/appsec/rasp/test_sqli.py @@ -2,7 +2,6 @@ # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2021 Datadog, Inc. -import pytest from utils import features, weblog, interfaces, scenarios, rfc, context from utils.dd_constants import Capabilities @@ -17,13 +16,6 @@ ) -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - - @rfc("https://docs.google.com/document/d/1vmMqpl8STDk7rJnd3YBsa6O9hCls_XHHdsodD61zr_4/edit#heading=h.gv4kwto3561e") @features.rasp_sql_injection @scenarios.appsec_rasp diff --git a/tests/appsec/rasp/test_ssrf.py b/tests/appsec/rasp/test_ssrf.py index eafab0e74be..f69b10e8761 100644 --- a/tests/appsec/rasp/test_ssrf.py +++ b/tests/appsec/rasp/test_ssrf.py @@ -2,7 +2,6 @@ # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2021 Datadog, Inc. -import pytest from utils import features, weblog, interfaces, scenarios, rfc, context from utils.dd_constants import Capabilities @@ -17,13 +16,6 @@ ) -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - - @rfc("https://docs.google.com/document/d/1vmMqpl8STDk7rJnd3YBsa6O9hCls_XHHdsodD61zr_4/edit#heading=h.3r1lwuv4y2g3") @features.rasp_server_side_request_forgery @scenarios.appsec_rasp diff --git a/tests/appsec/test_blocking_addresses.py b/tests/appsec/test_blocking_addresses.py index 6eb4d89f3dc..8a3e06cdabf 100644 --- a/tests/appsec/test_blocking_addresses.py +++ b/tests/appsec/test_blocking_addresses.py @@ -3,7 +3,6 @@ # Copyright 2021 Datadog, Inc. import json -import pytest from utils import ( bug, @@ -19,12 +18,6 @@ HttpResponse, ) -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - def _assert_custom_event_tag_presence(expected_value: str): def wrapper(span: dict): diff --git a/tests/appsec/test_conf.py b/tests/appsec/test_conf.py index 994bd2f3bd6..5253cde9402 100644 --- a/tests/appsec/test_conf.py +++ b/tests/appsec/test_conf.py @@ -3,20 +3,11 @@ # Copyright 2021 Datadog, Inc. -import pytest - from utils import weblog, context, interfaces, missing_feature, irrelevant, rfc, scenarios, features from utils.tools import nested_lookup from utils.dd_constants import PYTHON_RELEASE_GA_1_1 -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - - TELEMETRY_REQUEST_TYPE_GENERATE_METRICS = "generate-metrics" diff --git a/tests/appsec/test_fingerprinting.py b/tests/appsec/test_fingerprinting.py index bf4ec841cd0..a9a796b6e72 100644 --- a/tests/appsec/test_fingerprinting.py +++ b/tests/appsec/test_fingerprinting.py @@ -1,5 +1,4 @@ import re -import pytest from utils.dd_constants import Capabilities from utils import features from utils import interfaces @@ -13,12 +12,6 @@ ARACHNI_HEADERS = {"User-Agent": "Arachni/v1.5.1"} DD_BLOCK_HEADERS = {"User-Agent": "dd-test-scanner-log-block"} -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - def get_span_meta(r: HttpResponse): res = [span.get("meta", {}) for _, _, span in interfaces.library.get_spans(request=r)] diff --git a/tests/appsec/test_only_python.py b/tests/appsec/test_only_python.py index bcbebd0b2da..c3b4af04900 100644 --- a/tests/appsec/test_only_python.py +++ b/tests/appsec/test_only_python.py @@ -2,18 +2,10 @@ # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2021 Datadog, Inc. -import pytest from utils import context, features, interfaces, irrelevant, scenarios, flaky -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - - @scenarios.appsec_blocking @scenarios.appsec_lambda_blocking @scenarios.appsec_rasp diff --git a/tests/appsec/test_trace_tagging.py b/tests/appsec/test_trace_tagging.py index 85ab08743ac..e575c5681d8 100644 --- a/tests/appsec/test_trace_tagging.py +++ b/tests/appsec/test_trace_tagging.py @@ -1,25 +1,16 @@ # Unless explicitly stated otherwise all files in this repository are licensed under the the Apache License Version 2.0. # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2021 Datadog, Inc. -import pytest from utils import ( interfaces, scenarios, weblog, features, - context, ) from utils.dd_constants import Capabilities, SamplingPriority -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - - @features.appsec_trace_tagging_rules @scenarios.appsec_blocking @scenarios.appsec_lambda_blocking diff --git a/tests/appsec/waf/test_blocking.py b/tests/appsec/waf/test_blocking.py index 701f72f2795..bbb47333e52 100644 --- a/tests/appsec/waf/test_blocking.py +++ b/tests/appsec/waf/test_blocking.py @@ -1,5 +1,4 @@ from pathlib import Path -import pytest from utils import interfaces, bug, scenarios, weblog, rfc, missing_feature, flaky, features from utils._context.core import context @@ -10,13 +9,6 @@ ) -if context.library > "python_lambda@8.117.0": - pytestmark = [ - pytest.mark.xfail(reason="bug (APPSEC-60014)"), - pytest.mark.declaration(declaration="bug", details="APPSEC-60014"), - ] - - BLOCK_TEMPLATE_JSON_MIN_V1 = "blocked.v1.min.json" BLOCK_TEMPLATE_HTML_MIN_V2 = "blocked.v2.min.html" BLOCK_TEMPLATE_JSON_MIN_V3 = "blocked.v3.min.json"