From 7f96c2b0aba66cb6737a22cbc44c5f1a214c901f Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Wed, 28 Dec 2016 17:00:21 +0100
Subject: [PATCH] Finer error checks

---
 .tests/.lib.sh | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/.tests/.lib.sh b/.tests/.lib.sh
index 024a7c15..2f5db227 100644
--- a/.tests/.lib.sh
+++ b/.tests/.lib.sh
@@ -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
 }