Skip to content

Commit

Permalink
Merge pull request #2411 from DataDog/cbeauchesne/skip-flaky-tests
Browse files Browse the repository at this point in the history
Skip some flaky tests
  • Loading branch information
cbeauchesne authored Apr 30, 2024
2 parents f4f5701 + 07bbce3 commit 3013c2c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion tests/integrations/test_dsm.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This product includes software developed at Datadog (https://www.datadoghq.com/).
# Copyright 2023 Datadog, Inc.

from utils import weblog, interfaces, scenarios, irrelevant, context, bug, features, missing_feature
from utils import weblog, interfaces, scenarios, irrelevant, context, bug, features, missing_feature, flaky
from utils.tools import logger

import base64
Expand Down Expand Up @@ -34,6 +34,7 @@ class Test_DsmKafka:
def setup_dsm_kafka(self):
self.r = weblog.get(f"/dsm?integration=kafka&queue={DSM_QUEUE}&group={DSM_CONSUMER_GROUP}")

@flaky(library="java", reason="AIT-10206")
def test_dsm_kafka(self):
assert self.r.text == "ok"

Expand Down
1 change: 1 addition & 0 deletions tests/parametric/test_span_sampling.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ def test_multi_rule_drop_keep_span_sampling_sss007(self, test_agent, test_librar
assert span["metrics"].get(SINGLE_SPAN_SAMPLING_MECHANISM) is None
assert span["metrics"].get(SINGLE_SPAN_SAMPLING_MAX_PER_SEC) is None

@flaky(library="cpp", reason="The test itself is probably flaky")
@missing_feature(
context.library == "php",
reason="PHP uses a float to represent the allowance in tokens and thus accepts one more request (given the time elapsed between individual requests)",
Expand Down
3 changes: 2 additions & 1 deletion tests/parametric/test_trace_sampling.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from utils.parametric.spec.trace import Span
from utils.parametric.spec.trace import find_span_in_traces
from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY, SAMPLING_RULE_PRIORITY_RATE
from utils import rfc, scenarios, missing_feature, context, features, bug
from utils import rfc, scenarios, missing_feature, flaky, features, bug


@features.trace_sampling
Expand Down Expand Up @@ -488,6 +488,7 @@ def test_meta_existence(self, test_agent, test_library):

@pytest.mark.parametrize("library_env", [tag_sampling_env("*"), tag_sampling_env("**"), tag_sampling_env("***")])
@missing_feature(library="cpp", reason="No metric interface")
@flaky(library="golang", reason="The test itself is probably flaky")
def test_metric_existence(self, test_agent, test_library):
"""Tests that any patterns are equivalent to an existence check for metrics"""
with test_library:
Expand Down

0 comments on commit 3013c2c

Please sign in to comment.