From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 3 Sep 2025 15:49:34 +0000 (+0900)
Subject: test: add test case for issue #38765
X-Git-Tag: v258-rc4~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F38776%2Fhead;p=thirdparty%2Fsystemd.git

test: add test case for issue #38765
---

diff --git a/src/core/transaction.c b/src/core/transaction.c
index 1d8168257f8..0f7fe451e7f 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -172,6 +172,7 @@ static int delete_one_unmergeable_job(Transaction *tr, Job *job) {
                                  * another unit in which case we
                                  * rather remove the start. */
 
+                                /* Update test/units/TEST-87-AUX-UTILS-VM.sh when logs below are changed. */
                                 log_unit_debug(j->unit,
                                                "Looking at job %s/%s conflicted_by=%s",
                                                j->unit->id, job_type_to_string(j->type),
diff --git a/test/units/TEST-87-AUX-UTILS-VM.sh b/test/units/TEST-87-AUX-UTILS-VM.sh
index 9c2a033aa98..ecbff290f0e 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.sh
@@ -3,6 +3,14 @@
 set -eux
 set -o pipefail
 
+# For issue #38765
+journalctl --sync
+if journalctl -q -o short-monotonic --grep "Looking at job .*/.* conflicted_by=(yes|no)" >/failed; then
+    echo "Found unexpected unmergeable jobs"
+    cat /failed
+    exit 1
+fi
+
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh