integration tests: Make sure test_lib always knows about the socket file.

diff --git a/t/integration/simple_config.sh b/t/integration/simple_config.sh
index 1aacea720a3d58196956a424e6032198f3d7e3ce..3bdb10490915912190c4e7b46070a6342e6de6b4 100755 (executable)
--- a/t/integration/simple_config.sh
+++ b/t/integration/simple_config.sh
@@ -82,11 +82,12 @@ run_sysdbd -D -C "$SYSDBD_CONF"
 wait_for_sysdbd
 
 # reconfigure
+SOCKET_FILE="$SOCKET_FILE-2"
 cat <<EOF > "$SYSDBD_CONF"
-Listen "${SOCKET_FILE}-2"
+Listen "${SOCKET_FILE}"
 EOF
 kill -HUP $SYSDBD_PID
-wait_for_sysdbd "${SOCKET_FILE}-2"
+wait_for_sysdbd
 
 stop_sysdbd
 

diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh
index 496c02f7f27ee1c72b9b7ac2ffc213912d80161a..0cc1931770d15bb0b86a46c6a9f6ad23d3b479d1 100644 (file)
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -76,9 +76,6 @@ function stop_sysdbd() {
 function wait_for_sysdbd() {
        local socket="$SOCKET_FILE"
        local i
-       if test -n "$1"; then
-               socket="$1"
-       fi
        for (( i=0; i<10; i++ )); do
                if test -e "$socket"; then
                        break