From c9e3911eaf96658fa090afdc844c8f5b64d181ea Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 7 Dec 2015 14:20:35 +0100
Subject: [PATCH] tests: use consistent name for PID file

---
 tests/firewall-neg-test    | 8 +++++---
 tests/firewall-test        | 8 +++++---
 tests/full-test            | 8 +++++---
 tests/proxyproto-test      | 8 +++++---
 tests/proxyproto-unix-test | 8 +++++---
 tests/reload-info-test     | 8 +++++---
 6 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/tests/firewall-neg-test b/tests/firewall-neg-test
index 95b1f4e0..e4ff6e29 100755
--- a/tests/firewall-neg-test
+++ b/tests/firewall-neg-test
@@ -31,6 +31,7 @@ CONFIG="fw-neg"
 IMAGE=ocserv-fw-neg-test
 IMAGE_NAME=test_fw_neg_ocserv
 TMP=$IMAGE_NAME.tmp
+PIDFILE="$IMAGE_NAME.$$.pid"
 . ./docker-common.sh
 
 $DOCKER run -e OCCTL_PAGER=cat -P --privileged=true -p 22 --tty=false -d --name $IMAGE_NAME $IMAGE
@@ -72,7 +73,7 @@ fi
 echo ""
 echo "Connecting with correct username"
 $ECHO_E "test" >pass-full$TMP
-$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file ${srcdir}/pid1.$$ -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
+$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file $PIDFILE -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
 if test $? != 0;then
 	echo "Cannot connect to server"
 	stop
@@ -82,12 +83,12 @@ fi
 sleep 5
 
 rm -f pass-full$TMP
-if [ ! -f ${srcdir}/pid1.$$ ];then
+if [ ! -f $PIDFILE ];then
 	echo "It was not possible to establish session!"
 	stop
 fi
 
-PID=`cat ${srcdir}/pid1.$$`
+PID=`cat $PIDFILE`
 
 ping -w 5 192.168.31.1 -s 400
 if test $? != 0;then
@@ -124,6 +125,7 @@ fi
 sleep 2
 
 kill -INT $PID
+rm -f $PIDFILE
 
 $DOCKER stop $IMAGE_NAME
 $DOCKER rm $IMAGE_NAME
diff --git a/tests/firewall-test b/tests/firewall-test
index 6322427f..fa0621c3 100755
--- a/tests/firewall-test
+++ b/tests/firewall-test
@@ -31,6 +31,7 @@ CONFIG="fw"
 IMAGE=ocserv-fw-test
 IMAGE_NAME=test_fw_ocserv
 TMP=$IMAGE_NAME.tmp
+PIDFILE=IMAGE_NAME.$$.pid
 . ./docker-common.sh
 
 $DOCKER run -e OCCTL_PAGER=cat -P --privileged=true -p 22 --tty=false -d --name $IMAGE_NAME $IMAGE
@@ -72,7 +73,7 @@ fi
 echo ""
 echo "Connecting with correct username"
 $ECHO_E "test" >pass-full$TMP
-$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file ${srcdir}/pid1.$$ -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
+$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file $PIDFILE -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
 if test $? != 0;then
 	echo "Cannot connect to server"
 	stop
@@ -82,12 +83,13 @@ fi
 sleep 5
 
 rm -f pass-full$TMP
-if [ ! -f ${srcdir}/pid1.$$ ];then
+if [ ! -f $PIDFILE ];then
 	echo "It was not possible to establish session!"
 	stop
 fi
 
-PID=`cat ${srcdir}/pid1.$$`
+PID=`cat $PIDFILE`
+rm -f $PIDFILE
 
 ping -w 5 192.168.84.1 -s 400
 if test $? != 0;then
diff --git a/tests/full-test b/tests/full-test
index 5fd0dbec..3ad4866d 100755
--- a/tests/full-test
+++ b/tests/full-test
@@ -31,6 +31,7 @@ CONFIG="tcp"
 IMAGE=ocserv-test1
 IMAGE_NAME=test_ocserv
 TMP=$IMAGE_NAME.tmp
+PIDFILE="$IMAGE_NAME.$$.pid"
 . ./docker-common.sh
 
 $DOCKER run -e OCCTL_PAGER=cat -P --privileged=true -p 22 --tty=false -d --name $IMAGE_NAME $IMAGE
@@ -71,7 +72,7 @@ fi
 echo ""
 echo "Connecting with correct username"
 $ECHO_E "test" >pass-full$TMP
-$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file ${srcdir}/pid1.$$ -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
+$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file $PIDFILE -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
 if test $? != 0;then
 	echo "Cannot connect to server"
 	stop
@@ -81,12 +82,13 @@ fi
 sleep 5
 
 rm -f pass-full$TMP
-if [ ! -f ${srcdir}/pid1.$$ ];then
+if [ ! -f $PIDFILE ];then
 	echo "It was not possible to establish session!"
 	stop
 fi
 
-PID=`cat ${srcdir}/pid1.$$`
+PID=`cat $PIDFILE`
+rm -f $PIDFILE
 
 # The client IP depends on the username so it shouldn't change.
 ping -w 5 192.168.79.1
diff --git a/tests/proxyproto-test b/tests/proxyproto-test
index 792db00d..da13fa89 100755
--- a/tests/proxyproto-test
+++ b/tests/proxyproto-test
@@ -31,6 +31,7 @@ CONFIG="proxyproto"
 IMAGE=proxyproto-test
 IMAGE_NAME=test_proxyproto_ocserv
 TMP=$IMAGE_NAME.tmp
+PIDFILE="$IMAGE_NAME.$$.pid"
 . ./docker-common.sh
 
 $DOCKER run -e OCCTL_PAGER=cat -P --privileged=true -p 22 --tty=false -d --name $IMAGE_NAME $IMAGE
@@ -57,7 +58,7 @@ fi
 echo ""
 echo "Connecting with correct username"
 $ECHO_E "test" >pass-full$TMP
-$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file ${srcdir}/pid1.$$ -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
+$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file $PIDFILE -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
 if test $? != 0;then
 	echo "Cannot connect to server"
 	stop
@@ -67,12 +68,13 @@ fi
 sleep 5
 
 rm -f pass-full$TMP
-if [ ! -f ${srcdir}/pid1.$$ ];then
+if [ ! -f $PIDFILE ];then
 	echo "It was not possible to establish session!"
 	stop
 fi
 
-PID=`cat ${srcdir}/pid1.$$`
+PID=`cat $PIDFILE`
+rm -f $PIDFILE
 
 # The client IP depends on the username so it shouldn't change.
 ping -w 5 192.168.195.1
diff --git a/tests/proxyproto-unix-test b/tests/proxyproto-unix-test
index fa73627d..294ef88c 100755
--- a/tests/proxyproto-unix-test
+++ b/tests/proxyproto-unix-test
@@ -31,6 +31,7 @@ CONFIG="proxyproto-unix"
 IMAGE=proxyproto-unix-test
 IMAGE_NAME=test_proxyproto_unix_ocserv
 TMP=$IMAGE_NAME.tmp
+PIDFILE="$IMAGE_NAME.$$.pid"
 . ./docker-common.sh
 
 $DOCKER run -e OCCTL_PAGER=cat -P --privileged=true -p 22 --tty=false -d --name $IMAGE_NAME $IMAGE
@@ -57,7 +58,7 @@ fi
 echo ""
 echo "Connecting with correct username"
 $ECHO_E "test" >pass-full$TMP
-$OPENCONNECT $IP:$PORT_OCSERV -b --sslkey ./user-key.pem -c ./user-cn.pem --pid-file ${srcdir}/pid1.$$ -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
+$OPENCONNECT $IP:$PORT_OCSERV -b --sslkey ./user-key.pem -c ./user-cn.pem --pid-file $PIDFILE -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
 if test $? != 0;then
 	echo "Cannot connect to server"
 	stop
@@ -67,12 +68,13 @@ fi
 sleep 5
 
 rm -f pass-full$TMP
-if [ ! -f ${srcdir}/pid1.$$ ];then
+if [ ! -f $PIDFILE ];then
 	echo "It was not possible to establish session!"
 	stop
 fi
 
-PID=`cat ${srcdir}/pid1.$$`
+PID=`cat $PIDFILE`
+rm -f $PIDFILE
 
 # The client IP depends on the username so it shouldn't change.
 ping -w 5 192.168.196.1
diff --git a/tests/reload-info-test b/tests/reload-info-test
index 9dc608e4..82931da7 100755
--- a/tests/reload-info-test
+++ b/tests/reload-info-test
@@ -31,6 +31,7 @@ CONFIG="reload"
 IMAGE=ocserv-reload-info
 IMAGE_NAME=test_reload_info
 TMP=$IMAGE_NAME.tmp
+PIDFILE="$IMAGE_NAME.$$.pid"
 . ./docker-common.sh
 
 $DOCKER run -e OCCTL_PAGER=cat -P --privileged=true -p 22 --tty=false -d --name $IMAGE_NAME $IMAGE
@@ -57,7 +58,7 @@ fi
 echo ""
 echo "Connecting with correct username"
 $ECHO_E "test" >pass-full$TMP
-$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file ${srcdir}/pid1.$$ -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
+$OPENCONNECT $IP:$PORT_OCSERV -b --pid-file $PIDFILE -u test --passwd-on-stdin -v --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 < pass-full$TMP
 if test $? != 0;then
 	echo "Cannot connect to server"
 	stop
@@ -67,12 +68,13 @@ fi
 sleep 5
 
 rm -f pass-full$TMP
-if [ ! -f ${srcdir}/pid1.$$ ];then
+if [ ! -f $PIDFILE ];then
 	echo "It was not possible to establish session!"
 	stop
 fi
 
-PID=`cat ${srcdir}/pid1.$$`
+PID=`cat $PIDFILE`
+rm -f $PIDFILE
 
 # The client IP depends on the username so it shouldn't change.
 ping -w 5 192.168.87.1