From: Luca Boccassi Date: Mon, 8 Sep 2025 12:38:30 +0000 (+0100) Subject: test: remove extension from /var/lib/extensions at the end of the test X-Git-Tag: v257.10~67 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4dd7b7f900f47e6ffb225f487aaa70a85e42817;p=thirdparty%2Fsystemd.git test: remove extension from /var/lib/extensions at the end of the test Otherwise it remains there, and another test case accidentally uses it on refresh, which then makes another later test fail, as the hierarchy is already merged: [ 203.969708] TEST-50-DISSECT.sh[890]: + systemd-sysext status [ 203.981831] TEST-50-DISSECT.sh[2795]: HIERARCHY EXTENSIONS SINCE [ 203.982196] TEST-50-DISSECT.sh[2795]: /opt app0 Mon 2025-09-08 11:49:11 UTC [ 203.982551] TEST-50-DISSECT.sh[2795]: /usr app0 Mon 2025-09-08 11:49:11 UTC [ 204.119772] TEST-50-DISSECT.sh[2799]: Hierarchy '/usr' is already merged. Fixes https://github.com/systemd/systemd/issues/38282 (cherry picked from commit 9cc9e14ed4671eb8c0424b465504202371e17419) --- diff --git a/test/units/TEST-50-DISSECT.sysext.sh b/test/units/TEST-50-DISSECT.sysext.sh index 5302314d261..3c8c7de8c1c 100755 --- a/test/units/TEST-50-DISSECT.sysext.sh +++ b/test/units/TEST-50-DISSECT.sysext.sh @@ -1106,5 +1106,6 @@ systemd-sysext unmerge test ! -f /usr/lib/systemd/system/some_file mountpoint /usr/share umount /usr/share +rm -f /var/lib/extensions/app0.raw exit 0