tests: satisfy latest docker's restrictions

This commit is contained in:
Nikos Mavrogiannopoulos
2014-12-01 23:12:20 +01:00
parent 5019c4cebe
commit af91c73924
2 changed files with 10 additions and 10 deletions

View File

@@ -170,15 +170,15 @@ rm -f ./not-ok
ret=0 ret=0
rm -f ./ok rm -f ./tmp-full/ok
$DOCKER cp test_ocserv:/tmp/disconnect/ok ./ $DOCKER cp test_ocserv:/tmp/disconnect/ok ./tmp-full/
if ! test -f ./ok;then if ! test -f ./tmp-full/ok;then
echo "Don't know if stats were received" echo "Don't know if stats were received"
ret=77 ret=77
else else
echo -n "stats: " echo -n "stats: "
echo `cat ./ok` echo `cat ./tmp-full/ok`
rm -f ./ok rm -rf ./tmp-full/
fi fi
$DOCKER stop test_ocserv $DOCKER stop test_ocserv

View File

@@ -170,15 +170,15 @@ rm -f ./not-ok
ret=0 ret=0
rm -f ./ok rm -f ./tmp-unix/ok
$DOCKER cp test_unix:/tmp/disconnect/ok ./ $DOCKER cp test_ocserv:/tmp/disconnect/ok ./tmp-unix/
if ! test -f ./ok;then if ! test -f ./tmp-unix/ok;then
echo "Don't know if stats were received" echo "Don't know if stats were received"
ret=77 ret=77
else else
echo -n "stats: " echo -n "stats: "
echo `cat ./ok` echo `cat ./tmp-unix/ok`
rm -f ./ok rm -rf ./tmp-unix/
fi fi
$DOCKER stop test_unix $DOCKER stop test_unix