From 92ea4a2505ad6d181f4e18a56ff58878cf69e644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Wed, 24 Sep 2025 07:23:42 +0200 Subject: [PATCH] Patch system-tests to not abort on first failure --- ...Revert-system-tests-abort-on-failure.patch | 38 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 39 insertions(+) create mode 100644 debian/patches/0004-Revert-system-tests-abort-on-failure.patch diff --git a/debian/patches/0004-Revert-system-tests-abort-on-failure.patch b/debian/patches/0004-Revert-system-tests-abort-on-failure.patch new file mode 100644 index 00000000..0cc1026f --- /dev/null +++ b/debian/patches/0004-Revert-system-tests-abort-on-failure.patch @@ -0,0 +1,38 @@ +From: =?utf-8?q?S=C3=A9bastien_Delafond?= +Date: Wed, 24 Sep 2025 07:23:24 +0200 +Subject: Revert "system-tests: abort on failure" + +We'd rather have the test suite always run completely, and report +every failed test at the end. +--- + system/run.py | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/system/run.py b/system/run.py +index 4e73fb2..599afe5 100755 +--- a/system/run.py ++++ b/system/run.py +@@ -50,7 +50,6 @@ def run(include_long_tests=False, capture_results=False, tests=None, filters=Non + if not coverage_dir: + coverage_dir = mkdtemp(suffix="aptly-coverage") + +- failed = False + for test in tests: + orig_stdout = sys.stdout + orig_stderr = sys.stderr +@@ -158,15 +157,8 @@ def run(include_long_tests=False, capture_results=False, tests=None, filters=Non + + t.shutdown() + +- if failed: +- break +- if failed: +- break +- + sys.stdout = orig_stdout + sys.stderr = orig_stderr +- if failed: +- break + + if lastBase is not None: + lastBase.shutdown_class() diff --git a/debian/patches/series b/debian/patches/series index 1f3be551..f11fa659 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-disable-swagger.patch 0002-disable-new-azure-sdk.patch 0003-tests-no-upstream-s-etcd-install-as-it-s-arch-specif.patch +0004-Revert-system-tests-abort-on-failure.patch