GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-12 01:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests: avoid docker cp in kerberos test

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-05-21 11:25:26 +02:00
parent 700bae21f6
commit 4b811a6e2a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/docker-common.sh
+6 -1
View File
@@ -40,9 +40,14 @@ fi
check_for_file() { check_for_file() {
FILENAME=$1 FILENAME=$1
IMG=$2
if test -z "$IMG"; then
IMG=$IMAGE_NAME
fi
rm -f out$TMP rm -f out$TMP
$DOCKER exec $IMAGE_NAME ls $FILENAME >out$TMP $DOCKER exec $IMG ls $FILENAME >out$TMP
grep "$FILENAME" out$TMP|grep -v "cannot access" grep "$FILENAME" out$TMP|grep -v "cannot access"
if test $? != 0;then if test $? != 0;then
echo "could not find $FILENAME" echo "could not find $FILENAME"
tests/kerberos-test
+8 -13
View File
@@ -46,7 +46,7 @@ IMAGE=ocserv-kerberos-test
IMAGE_NAME=test_ocserv_kerberos IMAGE_NAME=test_ocserv_kerberos
. ./docker-common.sh . ./docker-common.sh
$DOCKER run -P --privileged=true --hostname=kerberos.test --add-host='kerberos.test:127.0.0.1' --tty=false -d --name test_ocserv_kerberos $IMAGE $DOCKER run -P --privileged=true --hostname=kerberos.test --add-host='kerberos.test:127.0.0.1' --tty=false -d --name $IMAGE_NAME $IMAGE
if test $? != 0;then if test $? != 0;then
echo "Cannot run docker image" echo "Cannot run docker image"
exit 1 exit 1
@@ -56,10 +56,10 @@ echo "ocserv image was run"
#wait for ocserv to server #wait for ocserv to server
sleep 5 sleep 5
IP=`$DOCKER inspect test_ocserv_kerberos | grep IPAddress | cut -d '"' -f 4` IP=`$DOCKER inspect $IMAGE_NAME | grep IPAddress | cut -d '"' -f 4`
if test -z "$IP";then if test -z "$IP";then
echo "Detected IP is null!" echo "Detected IP is null!"
$DOCKER inspect test_ocserv_kerberos $DOCKER inspect $IMAGE_NAME
stop stop
fi fi
echo "Detected KDC IP: $IP" echo "Detected KDC IP: $IP"
@@ -80,7 +80,7 @@ fi
CIP=`$DOCKER inspect test_ocserv_client_kerberos | grep IPAddress | cut -d '"' -f 4` CIP=`$DOCKER inspect test_ocserv_client_kerberos | grep IPAddress | cut -d '"' -f 4`
if test -z "$CIP";then if test -z "$CIP";then
echo "Detected client IP is null!" echo "Detected client IP is null!"
$DOCKER inspect test_ocserv_kerberos $DOCKER inspect $IMAGE_NAME
stop stop
fi fi
echo "Detected client IP: $CIP" echo "Detected client IP: $CIP"
@@ -92,19 +92,14 @@ fi
echo "Waiting for client tests" echo "Waiting for client tests"
sleep 100 sleep 100
mkdir -p tmp-kerb check_for_file /tmp/ok1 test_ocserv_client_kerberos
rm -f ./tmp-kerb/ok1 ./tmp-kerb/ok2 if test $? != 0;then
$DOCKER cp test_ocserv_client_kerberos:/tmp/ok1 ./tmp-kerb/
$DOCKER cp test_ocserv_client_kerberos:/tmp/ok2 ./tmp-kerb/
ret=0
if ! test -f ./tmp-kerb/ok1;then
echo "Kerberos client basic test failed" echo "Kerberos client basic test failed"
ret=1 ret=1
fi fi
if ! test -f ./tmp-kerb/ok2;then check_for_file /tmp/ok2 test_ocserv_client_kerberos
if test $? != 0;then
echo "Kerberos client TGT freshness test failed" echo "Kerberos client TGT freshness test failed"
ret=1 ret=1
fi fi