Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: mark some flaky tests #9144

Merged
merged 3 commits into from
May 2, 2024
Merged

ci: mark some flaky tests #9144

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e6e894
mark flaky tests
emmettbutler May 1, 2024
d1b6add
verbose test output in appsec_iast to pinpoint ephemeral segfault
emmettbutler May 1, 2024
93c38d6
Merge branch 'main' into emmett.butler/mark-flakes
emmettbutler May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion riotfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
Venv(
name="appsec_iast",
pys=select_pys(),
command="pytest {cmdargs} tests/appsec/iast/",
command="pytest -v {cmdargs} tests/appsec/iast/",
pkgs={
"requests": latest,
"pycryptodome": latest,
Expand Down
2 changes: 2 additions & 0 deletions tests/contrib/celery/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import ddtrace.internal.forksafe as forksafe
from ddtrace.propagation.http import HTTPPropagator
from tests.opentracer.utils import init_tracer
from tests.utils import flaky

from ...utils import override_global_config
from .base import CeleryBaseTestCase
Expand Down Expand Up @@ -209,6 +210,7 @@ def fn_task_parameters(user, force_logout=False):
assert run_span.get_tag("component") == "celery"
assert run_span.get_tag("span.kind") == "consumer"

@flaky(1722529274)
def test_fn_task_delay(self):
# using delay shorthand must preserve arguments
@self.app.task
Expand Down
2 changes: 2 additions & 0 deletions tests/internal/test_tracer_flare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from ddtrace.internal.flare import Flare
from ddtrace.internal.flare import FlareSendRequest
from ddtrace.internal.logger import get_logger
from tests.utils import flaky


DEBUG_LEVEL_INT = logging.DEBUG
Expand Down Expand Up @@ -118,6 +119,7 @@ def handle_agent_task():
for p in processes:
p.join()

@flaky(1722529274)
emmettbutler marked this conversation as resolved.
Show resolved Hide resolved
def test_multiple_process_partial_failure(self):
"""
Validte that even if the tracer flare fails for one process, we should
Expand Down
Loading