From c124bdec1a71c6845bfe41fdb02267cfaa5ec04e Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Mon, 27 Jan 2025 15:30:36 -0800 Subject: [PATCH] Fix Ruby test skip declaration --- .github/workflows/run-end-to-end.yml | 2 +- tests/test_span_events.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-end-to-end.yml b/.github/workflows/run-end-to-end.yml index 0d745b52abd..def4b705f77 100644 --- a/.github/workflows/run-end-to-end.yml +++ b/.github/workflows/run-end-to-end.yml @@ -193,7 +193,7 @@ jobs: if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, '"REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD_NOCACHE"') run: ./run.sh REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD_NOCACHE - name: Run AGENT_NOT_SUPPORTING_SPAN_EVENTS scenario - if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, 'AGENT_NOT_SUPPORTING_SPAN_EVENTS') && (inputs.library != 'ruby' || matrix.weblog == 'rack') + if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, 'AGENT_NOT_SUPPORTING_SPAN_EVENTS') run: ./run.sh AGENT_NOT_SUPPORTING_SPAN_EVENTS - name: Run APPSEC_MISSING_RULES scenario # C++ 1.2.0 freeze when the rules file is missing diff --git a/tests/test_span_events.py b/tests/test_span_events.py index b7ed80217f8..3ad7df96f90 100644 --- a/tests/test_span_events.py +++ b/tests/test_span_events.py @@ -19,7 +19,9 @@ class Test_SpanEvents_WithAgentSupport: def setup_v04_v07_default_format(self): self.r = weblog.get("/add_event") - @missing_feature(context.library in ["ruby"], reason="Native serialization not implemented") + @irrelevant( + context.library in ["ruby"] and "rack" not in context.weblog_variant, reason="Test is framework-independent" + ) def test_v04_v07_default_format(self): """For traces that default to the v0.4 or v0.7 format, send events as a top-level `span_events` field""" interfaces.library.assert_trace_exists(self.r)