From 7e00f4247a8cdda83ebbb16294061c22ac003080 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 16 Mar 2026 19:54:59 +0100 Subject: [PATCH] test-script-multi-user: Fix timeout: move sleep 600 inside connect branch The sleep-connect-script blocked on both connect and disconnect invocations. When the server shuts down, two disconnect scripts race past the test -f check simultaneously and both sleep 600s, exceeding the test timeout. Signed-off-by: Nikos Mavrogiannopoulos --- tests/meson.build | 2 +- tests/sleep-connect-script | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index b466f2ce..93338ced 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -225,7 +225,7 @@ if get_option('root-tests') test('test-script-multi-user', find_program('test-script-multi-user'), env: test_env, - timeout: 360, + timeout: 700, is_parallel: false, workdir: test_workdir, ) diff --git a/tests/sleep-connect-script b/tests/sleep-connect-script index 994f7ae7..648a6d11 100755 --- a/tests/sleep-connect-script +++ b/tests/sleep-connect-script @@ -1,12 +1,11 @@ #!/bin/sh -if ! test -f test-sleep.tmp;then - touch test-sleep.tmp - sleep 600 -fi - case "$REASON" in connect) + if ! test -f test-sleep.tmp;then + touch test-sleep.tmp + sleep 600 + fi ;; disconnect) ;;