Skip to content

Commit 1940f78

Browse files
authored
ci(wsgi): actually skip executing the problematic test instead of just xpassing it (#8052)
This test does what #8024 intended to do, skipping the execution of a test that has problematic side effects on other tests rather than executing it with XPASS. ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [ ] Title is accurate. - [ ] No unnecessary changes are introduced. - [ ] Description motivates each change. - [ ] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [ ] Testing strategy adequately addresses listed risk(s). - [ ] Change is maintainable (easy to change, telemetry, documentation). - [ ] Release note makes sense to a user of the library. - [ ] Reviewer has explicitly 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) - [ ] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. - [ ] This PR doesn't touch any of that.
1 parent a7810cc commit 1940f78

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

tests/contrib/wsgi/test_wsgi.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
from ddtrace import config
88
from ddtrace.contrib.wsgi import wsgi
9-
from tests.utils import flaky
109
from tests.utils import override_config
1110
from tests.utils import override_http_config
1211
from tests.utils import snapshot
@@ -259,7 +258,6 @@ def test_200():
259258
assert resp.status_int == 200
260259

261260

262-
@flaky(1735812000)
263261
@snapshot(ignores=["meta.error.stack"])
264262
def test_500_py3():
265263
app = TestApp(wsgi.DDWSGIMiddleware(application))
@@ -291,7 +289,6 @@ def test_wsgi_base_middleware(use_global_tracer, tracer):
291289
assert resp.status_int == 200
292290

293291

294-
@flaky(1735812000)
295292
@pytest.mark.snapshot(
296293
token="tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware_500",
297294
ignores=["meta.error.stack", "meta.error.type"],
@@ -321,7 +318,8 @@ def test_distributed_tracing_nested():
321318
assert resp.status_int == 200
322319

323320

324-
@flaky(1709662372)
321+
# FIXME: this test breaks other tests in this file in an unpredictable pattern
322+
"""
325323
def test_wsgi_traced_iterable(tracer, test_spans):
326324
# Regression test to ensure wsgi iterable does not define an __len__ attribute
327325
middleware = wsgi.DDWSGIMiddleware(application)
@@ -341,6 +339,7 @@ def start_response(status, headers, exc_info=None):
341339
assert hasattr(resp, "close")
342340
assert hasattr(resp, "next") or hasattr(resp, "__next__")
343341
assert not hasattr(resp, "__len__"), "Iterables should not define __len__ attribute"
342+
"""
344343

345344

346345
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)