From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 10 Oct 2014 10:21:22 +0000 (+0200)
Subject: integration tests: Make sure test_lib always knows about the socket file.
X-Git-Tag: sysdb-0.6.0~127
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=42d1e77a0987e3d51950a1d1c9b9049dfd377598;p=sysdb.git

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 1aacea7..3bdb104 100755
--- 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 496c02f..0cc1931 100644
--- 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