diff --git a/tests/radius-test b/tests/radius-test index d9586bdf..ca76e0b1 100755 --- a/tests/radius-test +++ b/tests/radius-test @@ -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 diff --git a/tests/radius-test-config b/tests/radius-test-config index 4b136a9a..34d78c6b 100755 --- a/tests/radius-test-config +++ b/tests/radius-test-config @@ -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'`