Skip to content

Commit 9d06b2b

Browse files
authored
chore(profiling): remove flaky marker (#12851)
## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
1 parent 479d945 commit 9d06b2b

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

tests/profiling/test_main.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import pytest
77

88
from tests.utils import call_program
9-
from tests.utils import flaky
109

1110
from . import utils
1211

@@ -106,8 +105,6 @@ def test_multiprocessing(method, tmp_path, monkeypatch):
106105
utils.check_pprof_file(filename + "." + str(child_pid) + ".1")
107106

108107

109-
@flaky(1742580778) # Marking as flaky so it will show up in flaky reports
110-
@pytest.mark.skipif(os.environ.get("GITLAB_CI") == "true", reason="Hanging and failing in GitLab CI")
111108
@pytest.mark.subprocess(
112109
ddtrace_run=True,
113110
env=dict(DD_PROFILING_ENABLED="1"),

tests/profiling_v2/test_main.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from tests.profiling.collector import lock_utils
99
from tests.profiling.collector import pprof_utils
1010
from tests.utils import call_program
11-
from tests.utils import flaky
1211

1312

1413
def test_call_script():
@@ -166,8 +165,6 @@ def test_multiprocessing(method, tmp_path):
166165
assert len(child_samples) > 0
167166

168167

169-
@flaky(1742580778) # Marking as flaky so it will show up in flaky reports
170-
@pytest.mark.skipif(os.environ.get("GITLAB_CI") == "true", reason="Hanging and failing in GitLab CI")
171168
@pytest.mark.subprocess(
172169
ddtrace_run=True,
173170
env=dict(DD_PROFILING_ENABLED="1"),

0 commit comments

Comments
 (0)