diff --git a/rosti.sh b/rosti.sh index 88095e7..4e2ccd9 100755 --- a/rosti.sh +++ b/rosti.sh @@ -1,5 +1,7 @@ #!/bin/bash +. ~/.bashrc + WIDTH=180 HEIGHT=25 diff --git a/tests.sh b/tests.sh index bf47067..378ac84 100755 --- a/tests.sh +++ b/tests.sh @@ -20,8 +20,7 @@ function stop() { # Default page run -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT default response correct" else @@ -37,9 +36,9 @@ stop # Node.js 12.14.1 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 12.14.1 response correct" else @@ -54,9 +53,9 @@ stop # Node.js 13.7.0 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 13.7.0 response correct" else @@ -72,9 +71,9 @@ stop # Python 3.8.2 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Python 3.8.1 response correct" else @@ -89,9 +88,9 @@ stop # PHP 7.4.2 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT PHP 7.4.2 response correct" else