ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-04-10 04:20:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finer error checks

Browse Source
This commit is contained in:
cytopia 2016-12-28 17:00:21 +01:00
parent 5719a9ec36
commit 7f96c2b0ab
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.tests/.lib.sh
View File

@ -408,10 +408,10 @@ debilbox_test() {
echo "docker-compose ps"
echo "------------------------------------------------------------"
docker-compose ps || true
echo
if ! _test_docker_compose >/dev/null 2>&1; then
if _test_docker_compose >/dev/null 2>&1; then
echo "[OK]: All running"
else
echo "[ERR]: Broken"
_ret="$(( _ret + 1 ))"
fi
@ -421,7 +421,6 @@ debilbox_test() {
###
print_h2 "3. Test status via curl"
echo "Count [OK]'s on curl-ed url"
echo "------------------------------------------------------------"
if _cnt="$( _test_curled_oks "${_oks}" )"; then
@ -436,7 +435,22 @@ debilbox_test() {
###
### Final return
###
return ${_ret}
if [ "${_ret}" != "0" ]; then
print_h2 "4. Error output"
echo "Curl"
echo "------------------------------------------------------------"
curl localhost
echo
echo "docker-compose ps"
echo "------------------------------------------------------------"
docker-compose ps
echo
return 1
fi
return 0
}
@ -444,14 +458,20 @@ debilbox_test() {
### Test against stopped containers
###
_test_docker_compose() {
_broken="$( docker-compose ps | grep -ci 'Exit' )"
_broken="$( docker-compose ps | grep -c 'Exit' )"
_running="$( docker-compose ps | grep -c 'Up' )"
_total="$( docker-compose ps -q | grep -c '' )"
if [ "${_broken}" != "0" ]; then
docker-compose ps
return 1
else
return 0
fi
if [ "${_running}" != "${_total}" ]; then
return 1
fi
return 0
}