Ensure tests really fail in case of errors

This commit is contained in:
cytopia 2018-12-29 14:22:51 +01:00
parent 0bf985103c
commit b23fef2fa4
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
3 changed files with 38 additions and 11 deletions
.tests
Makefile
vhost-tests/my-rhost

@ -217,7 +217,8 @@ test-vhost:
$(PHP_FILES), \
printf "[TEST] docker-compose exec php curl -sS http://$(VHOST)/$(file)"; \
cd $(CURRENT_PATH) && $(MAKE) _clean-round >/dev/null; \
if ! cd $(DEVILBOX_PATH) && docker-compose exec php curl -sS http://$(VHOST)/$(file) | grep -qE '^OK$$'; then \
cd $(DEVILBOX_PATH); \
if ! docker-compose exec php curl -sS http://$(VHOST)/$(file) | grep -qE '^OK$$'; then \
printf "\r[FAIL] docker-compose exec php curl -sS http://$(VHOST)/$(file)\n"; \
cd $(DEVILBOX_PATH) && docker-compose exec php curl -sS http://$(VHOST)/$(file); \
cd $(DEVILBOX_PATH) && docker-compose exec php curl -sS -I http://$(VHOST)/$(file); \
@ -236,7 +237,8 @@ test-vhost:
$(PHP_FILES), \
printf "[TEST] docker-compose exec php curl -sS https://$(VHOST)/$(file)"; \
cd $(CURRENT_PATH) && $(MAKE) _clean-round >/dev/null; \
if ! cd $(DEVILBOX_PATH) && docker-compose exec php curl -sS https://$(VHOST)/$(file) | grep -qE '^OK$$'; then \
cd $(DEVILBOX_PATH); \
if ! docker-compose exec php curl -sS https://$(VHOST)/$(file) | grep -qE '^OK$$'; then \
printf "\r[FAIL] docker-compose exec php curl -sS https://$(VHOST)/$(file)\n"; \
cd $(DEVILBOX_PATH) && docker-compose exec php curl -sS https://$(VHOST)/$(file); \
cd $(DEVILBOX_PATH) && docker-compose exec php curl -sS -I https://$(VHOST)/$(file); \
@ -255,7 +257,8 @@ test-vhost:
$(PHP_FILES), \
printf "[TEST] docker-compose exec php php /shared/httpd/$(PROJECTV)/htdocs/$(file)"; \
cd $(CURRENT_PATH) && $(MAKE) _clean-round >/dev/null; \
if ! cd $(DEVILBOX_PATH) && docker-compose exec php php /shared/httpd/$(PROJECTV)/htdocs/$(file) | grep -q '^OK$$'; then \
cd $(DEVILBOX_PATH); \
if ! docker-compose exec php php /shared/httpd/$(PROJECTV)/htdocs/$(file) | grep -q '^OK$$'; then \
printf "\r[TEST] docker-compose exec php php /shared/httpd/$(PROJECTV)/htdocs/$(file)\n"; \
cd $(DEVILBOX_PATH) && docker-composeexec php php /shared/httpd/$(PROJECTV)/htdocs/$(file); \
cd $(CURRENT_PATH) && $(MAKE) _logs; \

@ -5,26 +5,26 @@ set -u
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
COMPOSEPATH="${SCRIPTPATH}/../../../"
cd "${COMPOSEPATH}"
NODE_PATH="/shared/httpd/my-rhost/js"
NODE_FILE="index.js"
if ! cd "${COMPOSEPATH}" && docker-compose exec php test -d "${NODE_PATH}"; then
if ! docker-compose exec php test -d "${NODE_PATH}"; then
>&2 echo "[Warning], skipping startup, directory does not exist in container: ${NODE_PATH}"
exit 1
fi
if ! cd "${COMPOSEPATH}" && docker-compose exec php test -f "${NODE_PATH}/${NODE_FILE}"; then
if ! docker-compose exec php test -f "${NODE_PATH}/${NODE_FILE}"; then
>&2 echo "[Warning], skipping startup, file does not exist in container: ${NODE_PATH}/${NODE_FILE}"
exit 1
fi
# Check if at least one pm2 process is already running
if cd "${COMPOSEPATH}" && docker-compose exec --user devilbox php bash -c "cd /shared/httpd/my-rhost/js; pm2 show 0 >/dev/null"; then
if docker-compose exec --user devilbox php bash -c "cd /shared/httpd/my-rhost/js; pm2 show 0 >/dev/null"; then
>&2 echo "[Warning], pm2 process already running"
else
echo "su -c \"cd ${NODE_PATH}; pm2 start ${NODE_FILE}\" -l devilbox"
cd "${COMPOSEPATH}" && docker-compose exec --user devilbox php bash -c "cd /shared/httpd/my-rhost/js; pm2 start ${NODE_FILE}"
docker-compose exec --user devilbox php bash -c "cd /shared/httpd/my-rhost/js; pm2 start ${NODE_FILE}"
fi

@ -5,17 +5,18 @@ set -u
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
COMPOSEPATH="${SCRIPTPATH}/../../../../"
cd "${COMPOSEPATH}"
printf "[TEST] http://my-rhost.loc"
# 1st round
if ! cd "${COMPOSEPATH}" && docker-compose exec --user devilbox php curl http://my-rhost.loc | grep "Hellp World"; then
if ! docker-compose exec --user devilbox php curl http://my-rhost.loc | grep "Hello World"; then
sleep 1;
# 2nd round
if ! cd "${COMPOSEPATH}" && docker-compose exec --user devilbox php curl http://my-rhost.loc | grep "Hellp World"; then
if ! docker-compose exec --user devilbox php curl http://my-rhost.loc | grep "Hello World"; then
sleep 1;
# 3rd round
if ! cd "${COMPOSEPATH}" && docker-compose exec --user devilbox php curl http://my-rhost.loc | grep "Hellp World"; then
if ! docker-compose exec --user devilbox php curl http://my-rhost.loc | grep "Hello World"; then
printf "\r[FAIL] http://my-rhost.loc\n"
cd "${COMPOSEPATH}" && docker-compose exec --user devilbox php curl http://my-rhost.loc
exit 1
@ -28,3 +29,26 @@ if ! cd "${COMPOSEPATH}" && docker-compose exec --user devilbox php curl http://
else
printf "\r[OK] http://my-rhost.loc (1 round)\n"
fi
printf "[TEST] https://my-rhost.loc"
# 1st round
if ! docker-compose exec --user devilbox php curl https://my-rhost.loc | grep "Hello World"; then
sleep 1;
# 2nd round
if ! docker-compose exec --user devilbox php curl https://my-rhost.loc | grep "Hello World"; then
sleep 1;
# 3rd round
if ! docker-compose exec --user devilbox php curl https://my-rhost.loc | grep "Hello World"; then
printf "\r[FAIL] https://my-rhost.loc\n"
cd "${COMPOSEPATH}" && docker-compose exec --user devilbox php curl https://my-rhost.loc
exit 1
else
printf "\r[OK] https://my-rhost.loc (3 rounds)\n"
fi
else
printf "\r[OK] https://my-rhost.loc (2 rounds)\n"
fi
else
printf "\r[OK] https://my-rhost.loc (1 round)\n"
fi