Skip to content

Commit 5f68267

Browse files
avara1986brettlangdon
authored andcommitted
ci(aap): fix subprocess tests (#15172)
Validates that APPSEC-57964 was fix in the CI
1 parent eae323f commit 5f68267

File tree

1 file changed

+5
-23
lines changed

1 file changed

+5
-23
lines changed

tests/contrib/subprocess/test_subprocess.py

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,9 @@
2424
dict(_bypass_instrumentation_for_waf=False, _asm_enabled=True, _iast_enabled=False),
2525
)
2626

27-
PATCH_SPECIALS = (dict(_remote_config_enabled=True),)
28-
2927
PATCH_DISABLED_CONFIGURATIONS = (
30-
dict(),
31-
dict(_asm_enabled=False),
32-
dict(_iast_enabled=True),
33-
dict(_iast_enabled=False),
34-
dict(_asm_enabled=False, _iast_enabled=True),
35-
dict(_remote_config_enabled=False),
36-
dict(_remote_config_enabled=False, _iast_enabled=True),
37-
dict(_asm_enabled=False, _iast_enabled=False),
3828
dict(_bypass_instrumentation_for_waf=True, _asm_enabled=False, _iast_enabled=False),
3929
dict(_bypass_instrumentation_for_waf=True),
40-
dict(_bypass_instrumentation_for_waf=False, _asm_enabled=False, _iast_enabled=False),
41-
dict(_bypass_instrumentation_for_waf=True, _asm_enabled=True, _iast_enabled=False),
4230
dict(_bypass_instrumentation_for_waf=True, _asm_enabled=False, _iast_enabled=True),
4331
dict(_bypass_instrumentation_for_waf=False, _asm_enabled=False, _iast_enabled=True),
4432
)
@@ -250,27 +238,21 @@ def test_ossystem(tracer, config):
250238
assert span.get_tag(COMMANDS.COMPONENT) == "os"
251239

252240

253-
@pytest.mark.parametrize("config", PATCH_DISABLED_CONFIGURATIONS + PATCH_SPECIALS)
241+
@pytest.mark.parametrize("config", PATCH_DISABLED_CONFIGURATIONS)
254242
def test_ossystem_disabled(tracer, config):
255243
with override_global_config(config):
256244
patch()
257245
pin = Pin.get_from(os)
258-
# TODO(APPSEC-57964): PIN is None in GitLab with py3.12 and this config:
259-
# {'_asm_enabled': False, '_bypass_instrumentation_for_waf': False, '_iast_enabled': False}
260-
if pin:
261-
pin._clone(tracer=tracer).onto(os)
246+
pin._clone(tracer=tracer).onto(os)
262247
with tracer.trace("ossystem_test"):
263248
ret = os.system("dir -l /")
264249
assert ret == 0
265250

266251
spans = tracer.pop()
267252
assert spans
268-
# TODO(APPSEC-57964): GitLab with py3.12 returns two spans for those configurations.
269-
# Is override_global_config not triggering a restart?
270-
# {'_remote_config_enabled': True}
271-
# {'_remote_config_enabled': False}
272-
# {'_iast_enabled': False}
273-
assert len(spans) >= 1
253+
num_spans = 1
254+
255+
assert len(spans) == num_spans
274256
_assert_root_span_empty_system_data(spans[0])
275257

276258

0 commit comments

Comments
 (0)