From 621df84009ce70f5d9d5bb093a0ac1b72dc7d410 Mon Sep 17 00:00:00 2001
From: Ivan Kruglov <mail@ikruglov.com>
Date: Wed, 16 Sep 2026 05:59:12 -0700
Subject: [PATCH] test: give the D-Bus reconnect checks their own integration
 test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Killing the broker is destructive well beyond the units under test: nothing
reconnects to the new one, so logind for instance keeps running with
org.freedesktop.login1 unowned for the rest of the boot. As a subtest of
TEST-23-UNIT-FILE that leaked into everything running after it, and
statedir.sh, the first one to start user@0.service, then spent 25s per logind
property in user-runtime-dir and, where pam_systemd can't use Varlink, blocked
in CreateSession() past user@.service's 90s TimeoutStartSec and failed — with
the failure pointing at a subtest that has nothing to do with the bus.

In its own test the damage dies with the machine.
---
 test/integration-tests/TEST-95-DBUS-RECONNECT/meson.build  | 7 +++++++
 test/integration-tests/meson.build                         | 1 +
 ...IT-FILE.dbus-reconnect.sh => TEST-95-DBUS-RECONNECT.sh} | 2 ++
 3 files changed, 10 insertions(+)
 create mode 100644 test/integration-tests/TEST-95-DBUS-RECONNECT/meson.build
 rename test/units/{TEST-23-UNIT-FILE.dbus-reconnect.sh => TEST-95-DBUS-RECONNECT.sh} (99%)

diff --git a/test/integration-tests/TEST-95-DBUS-RECONNECT/meson.build b/test/integration-tests/TEST-95-DBUS-RECONNECT/meson.build
new file mode 100644
index 0000000000..8dec5f37e7
--- /dev/null
+++ b/test/integration-tests/TEST-95-DBUS-RECONNECT/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+integration_tests += [
+        integration_test_template + {
+                'name' : fs.name(meson.current_source_dir()),
+        },
+]
diff --git a/test/integration-tests/meson.build b/test/integration-tests/meson.build
index dbfc5d5a11..fe0bf3cccc 100644
--- a/test/integration-tests/meson.build
+++ b/test/integration-tests/meson.build
@@ -111,6 +111,7 @@ foreach dirname : [
         'TEST-92-TPM2-SWTPM',
         'TEST-93-CLONESETUP',
         'TEST-94-COCO',
+        'TEST-95-DBUS-RECONNECT',
 ]
         subdir(dirname)
 endforeach
diff --git a/test/units/TEST-23-UNIT-FILE.dbus-reconnect.sh b/test/units/TEST-95-DBUS-RECONNECT.sh
similarity index 99%
rename from test/units/TEST-23-UNIT-FILE.dbus-reconnect.sh
rename to test/units/TEST-95-DBUS-RECONNECT.sh
index 9a64131cd5..d8b9ce1073 100755
--- a/test/units/TEST-23-UNIT-FILE.dbus-reconnect.sh
+++ b/test/units/TEST-95-DBUS-RECONNECT.sh
@@ -159,3 +159,5 @@ systemctl daemon-reexec
 touch "$marker"
 poll "$unit" SubState running
 systemctl stop "$unit"
+
+touch /testok