Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Revert "Skip flakky CI tests"
This reverts commit be4f0ba.
  • Loading branch information
ogrisel committed Aug 27, 2025
commit 5066d988dbd37a7fbaf4e55463ae2ad8ce5294c4
18 changes: 8 additions & 10 deletions testing/test_faulthandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from __future__ import annotations

import io
import os
import sys

from _pytest.pytester import Pytester
Expand Down Expand Up @@ -71,20 +72,15 @@ def test_disabled():
assert result.ret == 0


@pytest.mark.parametrize(
"enabled",
[
pytest.param(
True, marks=pytest.mark.skip(reason="sometimes crashes on CI (#7022)")
),
False,
],
)
@pytest.mark.parametrize("enabled", [True, False])
def test_timeout(pytester: Pytester, enabled: bool) -> None:
"""Test option to dump tracebacks after a certain timeout.

If faulthandler is disabled, no traceback will be dumped.
"""
if enabled and "CI" in os.environ:
pytest.xfail(reason="sometimes crashes on CI (#7022)")

pytester.makepyfile(
"""
import os, time
Expand All @@ -110,10 +106,12 @@ def test_timeout():
assert result.ret == 0


@pytest.mark.skip(reason="sometimes crashes on CI (#7022)")
@pytest.mark.parametrize("exit_on_timeout", [True, False])
def test_timeout_and_exit(pytester: Pytester, exit_on_timeout: bool) -> None:
"""Test option to force exit pytest process after a certain timeout."""
if "CI" in os.environ:
pytest.xfail(reason="sometimes crashes on CI (#7022)")

pytester.makepyfile(
"""
import os, time
Expand Down