Control: tags 1127660 + patch Control: tags 1127660 + pending Dear maintainer,
I've prepared an NMU for con-duct (versioned as 0.17.0-1.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for con-duct-0.17.0 con-duct-0.17.0 changelog | 8 + patches/0001-Increase-wait-time-on-rerun-for-flakey-tests.patch | 56 ++++++++++ patches/series | 1 3 files changed, 65 insertions(+) diff -Nru con-duct-0.17.0/debian/changelog con-duct-0.17.0/debian/changelog --- con-duct-0.17.0/debian/changelog 2025-09-24 02:51:26.000000000 +0300 +++ con-duct-0.17.0/debian/changelog 2026-03-12 14:14:17.000000000 +0200 @@ -1,3 +1,11 @@ +con-duct (0.17.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix to retry signal tests with increased + wait times. (Closes: #1127660) + + -- Adrian Bunk <[email protected]> Thu, 12 Mar 2026 14:14:17 +0200 + con-duct (0.17.0-1) unstable; urgency=medium * Team upload. diff -Nru con-duct-0.17.0/debian/patches/0001-Increase-wait-time-on-rerun-for-flakey-tests.patch con-duct-0.17.0/debian/patches/0001-Increase-wait-time-on-rerun-for-flakey-tests.patch --- con-duct-0.17.0/debian/patches/0001-Increase-wait-time-on-rerun-for-flakey-tests.patch 1970-01-01 02:00:00.000000000 +0200 +++ con-duct-0.17.0/debian/patches/0001-Increase-wait-time-on-rerun-for-flakey-tests.patch 2026-03-12 14:01:59.000000000 +0200 @@ -0,0 +1,56 @@ +From 9311d6d9cf1718c8450cd67f5d6153d5bf68dbb9 Mon Sep 17 00:00:00 2001 +From: Austin Macdonald <[email protected]> +Date: Tue, 6 Jan 2026 16:42:23 -0600 +Subject: Increase wait time on rerun for flakey tests + +Signal tests fail sometimes, probably due to a race condition. +On slow startup on some CI systems (I've never seen locally) the signal +could be sent before the signal handler is registered. If that is whats +happening, the test fails, and on the next rerun the wait time inceases. +--- + test/test_execution.py | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/test/test_execution.py b/test/test_execution.py +index 697ba60..e84a543 100644 +--- a/test/test_execution.py ++++ b/test/test_execution.py +@@ -221,10 +221,14 @@ def _runner_for_signal_int(temp_output_dir: str, fail_time: float | None) -> int + return execute(args) + + [email protected](reruns=5) + @pytest.mark.parametrize("fail_time", [None, 0, 10, -1, -3.14]) +-def test_signal_int(temp_output_dir: str, fail_time: float | None) -> None: +- +- wait_time = 0.3 ++def test_signal_int( ++ request: pytest.FixtureRequest, temp_output_dir: str, fail_time: float | None ++) -> None: ++ # Scale wait time on retries to handle slow CI runners (PyPy, Mac) ++ attempt = getattr(request.node, "execution_count", 1) ++ wait_time = 0.2 * attempt + proc = multiprocessing.Process( + target=_runner_for_signal_int, args=(temp_output_dir, fail_time) + ) +@@ -258,10 +262,14 @@ def _runner_for_signal_kill(temp_output_dir: str, fail_time: float | None) -> in + return execute(args) + + [email protected](reruns=5) + @pytest.mark.parametrize("fail_time", [None, 0, 10, -1, -3.14]) +-def test_signal_kill(temp_output_dir: str, fail_time: float | None) -> None: +- +- wait_time = 0.6 ++def test_signal_kill( ++ request: pytest.FixtureRequest, temp_output_dir: str, fail_time: float | None ++) -> None: ++ # Scale wait time on retries to handle slow CI runners (PyPy, Mac) ++ attempt = getattr(request.node, "execution_count", 1) ++ wait_time = 0.2 * attempt + proc = multiprocessing.Process( + target=_runner_for_signal_kill, args=(temp_output_dir, fail_time) + ) +-- +2.47.3 + diff -Nru con-duct-0.17.0/debian/patches/series con-duct-0.17.0/debian/patches/series --- con-duct-0.17.0/debian/patches/series 2025-09-24 02:49:33.000000000 +0300 +++ con-duct-0.17.0/debian/patches/series 2026-03-12 14:14:15.000000000 +0200 @@ -1,2 +1,3 @@ 0001-fix-verisons-in-package.patch 0002-Use-python3-instead-of-python-in-test.patch +0001-Increase-wait-time-on-rerun-for-flakey-tests.patch
