diff --git a/tests/debugging/mocking.py b/tests/debugging/mocking.py index 6b339a8512f..23381e06c71 100644 --- a/tests/debugging/mocking.py +++ b/tests/debugging/mocking.py @@ -112,6 +112,9 @@ def wait_for_payloads(self, cond=lambda _: bool(_), timeout=1.0): return self.payloads + def flush(self) -> None: + self.queue.clear() + @property def collector(self): return self._collector diff --git a/tests/debugging/origin/test_span.py b/tests/debugging/origin/test_span.py index 62267401480..a0363fd08dd 100644 --- a/tests/debugging/origin/test_span.py +++ b/tests/debugging/origin/test_span.py @@ -40,8 +40,14 @@ def tearDown(self): ddtrace.tracer = self.backup_tracer super(SpanProbeTestCase, self).tearDown() + if (uploader := MockSpanCodeOriginProcessor.get_uploader()) is not None: + uploader.flush() + MockSpanCodeOriginProcessorEntry.disable() MockSpanCodeOriginProcessor.disable() + + assert MockSpanCodeOriginProcessor.get_uploader() is None + core.reset_listeners(event_id="service_entrypoint.patch") def test_span_origin(self):