]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
TEST-46-HOMED: fix 2 minute timeout in cleanup
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 16 Dec 2025 13:45:40 +0000 (14:45 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 4 Jan 2026 15:04:54 +0000 (16:04 +0100)
The test passes but for two minutes the cleanup function just logs:
Failed to inspect home: No home for user homedsshtest known
Failed to inspect home: No home for user homedsshtest known
Failed to inspect home: No home for user homedsshtest known
...

Do not wait for the user to become inactive or remove the user if 'homectl
inspect' doesn't find the user. This brings a successfull run from 176 s
to 58 s here.

test/units/TEST-46-HOMED.sh

index 6de15789669f3c66871ccb649a169b5d7e44ead4..46abca9bace726ecc38e402980263af6a833c400 100755 (executable)
@@ -578,8 +578,10 @@ cleanup_ssh() (
     systemctl is-active -q mysshserver.socket && systemctl stop mysshserver.socket
     rm -f /tmp/homed.id_ecdsa /run/systemd/system/mysshserver{@.service,.socket}
     systemctl daemon-reload
-    wait_for_state homedsshtest inactive
-    homectl remove homedsshtest
+    if homectl inspect homedsshtest &>/dev/null; then
+        wait_for_state homedsshtest inactive
+        homectl remove homedsshtest
+    fi
     for dir in /etc /usr/lib; do
         if [[ -f "$dir/pam.d/sshd.bak" ]]; then
             mv "$dir/pam.d/sshd.bak" "$dir/pam.d/sshd"