fix circleci integration

circle.yml

@@ -6,8 +6,6 @@ test:
     - ./tests/pre-test-run.sh
   override:
     - ./tests/test-run.sh
-  post:
-    - ./tests/tests/post-test-run.sh
 # deployment:
 #   hub:
 #     branch: master

tests/pre-test-run.sh

@@ -47,27 +47,36 @@ echo "Gateway IP: $GATEWAY_IP"
 # Wait for databases to be ready
 
 echo "Waiting for science-db to start..."
-sleep 3
-until [ $(docker exec science-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
-    printf '.'
-    sleep 1
-done
+if [ "$CIRCLECI" = true ] ; then
+  sleep 5
+else
+  until [ $(docker exec science-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
+      printf '.'
+      sleep 1
+  done
+fi
 echo ""
 
 echo "Waiting for meta-db to start..."
-sleep 3
+if [ "$CIRCLECI" = true ] ; then
+  sleep 5
+else
 until [ $(docker exec meta-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
     printf '.'
     sleep 1
 done
+fi
 echo ""
 
 echo "Waiting for portal-db to start..."
-sleep 3
+if [ "$CIRCLECI" = true ] ; then
+  sleep 5
+else
 until [ $(docker exec portal-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
     printf '.'
     sleep 1
 done
+fi
 echo ""
 
 
@@ -98,4 +107,4 @@ until [ $(docker logs backend-test | grep "Started MIPApplication" | wc -l) -eq
 done
 
 
-echo "DONE"
\ No newline at end of file
+echo "DONE"