test: add test case for issue #38765

diff --git a/src/core/transaction.c b/src/core/transaction.c
index 1d8168257f83c70e6af4e174144a95846e1aa619..0f7fe451e7fce6180106f7c8a7c22fbb179e9c30 100644 (file)
--- 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 9c2a033aa98d17ce1517bf42cf30c31c187ab0ea..ecbff290f0e351312ee94f498a0b60837a95d0f9 100755 (executable)
--- 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