From 59eb4a5a00fbb4c283d244de4fef448152fc2380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Sat, 6 Oct 2018 16:12:05 +0300
Subject: [PATCH] Minor script flow restructure

---
 tests/compose/test-script.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/compose/test-script.sh b/tests/compose/test-script.sh
index 5fdddf04..7e3ab266 100755
--- a/tests/compose/test-script.sh
+++ b/tests/compose/test-script.sh
@@ -18,11 +18,13 @@ if [ -z "$DOCKER_ORG" ]; then
 fi
 
 containers_check() {
+	sleep 1m
 	STATUS=0
 	for container in "${containers[@]}"; do
 		echo "Checking ${DOCKER_ORG}_${container}"
 		docker inspect "${DOCKER_ORG}_${container}" | grep '"Status": "running"' || STATUS=1
 	done
+	docker ps -a
 	return $STATUS
 }
 
@@ -47,8 +49,6 @@ die() {
 for file in tests/compose/*.env ; do
 	cp $file .env
 	docker-compose -f tests/compose/run.yml -p $DOCKER_ORG up -d
-	sleep 1m
-	docker ps -a
 	container_logs
 	containers_check || die 1
 	clean