tests: cleanups

This commit is contained in:
Nikos Mavrogiannopoulos
2015-05-20 16:10:36 +02:00
parent 70bb46d206
commit 77c98f4534
2 changed files with 2 additions and 8 deletions

View File

@@ -135,20 +135,18 @@ if test $? = 0;then
stop
fi
rm -f $TMPDIR/stats
FILE=`$DOCKER exec $IMAGE_NAME ls /var/log/radius/radacct/127.0.0.1/`
echo $DOCKER exec $IMAGE_NAME cat "/var/log/radius/radacct/127.0.0.1/$FILE"
$DOCKER exec $IMAGE_NAME cat "/var/log/radius/radacct/127.0.0.1/$FILE"
OCTETS=`$DOCKER exec $IMAGE_NAME cat "/var/log/radius/radacct/127.0.0.1/$FILE"|grep Acct-Input-Octets|tail -1|sed 's/Acct-Input-Octets = //g'`
if test -z "$OCTETS" || test "$OCTETS" = 0;then
$DOCKER exec $IMAGE_NAME cat "/var/log/radius/radacct/127.0.0.1/$FILE"
echo "Interim update showed no data!"
stop
fi
check_for_file /tmp/disconnect/ok
if test $? != 0;then
$DOCKER exec $IMAGE_NAME cat "/var/log/radius/radacct/127.0.0.1/$FILE"
echo "There was an issue getting stats"
stop
fi

View File

@@ -79,10 +79,6 @@ echo "Waiting for accounting report"
sleep 60
TMPDIR=radius-$TMP
mkdir -p $TMPDIR
FILE=`$DOCKER exec $IMAGE_NAME ls /var/log/radius/radacct/127.0.0.1/`
OCTETS=`$DOCKER exec $IMAGE_NAME cat "/var/log/radius/radacct/127.0.0.1/$FILE"|grep Acct-Input-Octets|tail -1|sed 's/Acct-Input-Octets = //g'`