workig on tests

captain.yml

@@ -11,8 +11,6 @@ builder:
     - echo "Building project..."
     - docker run --rm -v $WORKSPACE:/build/ -v $HOME/.m2:/home/build/.m2/ portal-backend-builder:latest
     - echo "Finished building project"
-  test:
-    - ./tests/test-build.sh
 
 portal-backend:
   build: Dockerfile

tests/post-test-run.sh

@@ -3,13 +3,25 @@
 
 # Kill old containers
 
-docker kill backend-test
-docker kill portal-db-test
-docker kill science-db-test
+if [ $(docker ps | grep backend-test | wc -l) -gt 0 ]; then
+  docker kill backend-test
+fi
+if [ $(docker ps | grep portal-db-test | wc -l) -gt 0 ]; then
+  docker kill portal-db-test
+fi
+if [ $(docker ps | grep science-db-test | wc -l) -gt 0 ]; then
+  docker kill science-db-test
+fi
 
 
 # Remove old containers
 
-docker rm -f backend-test
-docker rm -f portal-db-test
-docker rm -f science-db-test
+if [ $(docker ps -a | grep backend-test | wc -l) -gt 0 ]; then
+  docker rm -f backend-test
+fi
+if [ $(docker ps -a | grep portal-db-test | wc -l) -gt 0 ]; then
+  docker rm -f portal-db-test
+fi
+if [ $(docker ps -a | grep science-db-test | wc -l) -gt 0 ]; then
+  docker rm -f science-db-test
+fi

tests/pre-test-run.sh

@@ -29,8 +29,8 @@ fi
 
 # Run databases containers
 
-docker run --name science-db-test -p 65432:5432 -v $(pwd)/science-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=science -d postgres:9.5.3
-docker run --name portal-db-test -p 65433:5432 -v $(pwd)/meta-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=portal -d postgres:9.5.3
+docker run --name science-db-test -p 65432:5432 -v $(pwd)/tests/science-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=science -d postgres:9.5.3
+docker run --name portal-db-test -p 65433:5432 -v $(pwd)/tests/meta-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=portal -d postgres:9.5.3
 
 
 # Get gateway IP

tests/test-build.sh

-#!/usr/bin/env bash
-
-if [ ! -f ./target/portal-backend-1.0.0-docker-packaging.jar ]; then
-    exit 1
-fi
-
-exit 0

tests/test-run.sh

@@ -3,7 +3,7 @@
 
 # Get gateway IP
 
-GATEWAY_IP=$(docker inspect portal-db-test | grep \"Gateway\":\ \" | sed 's/.*Gateway\":\ \"\([^-]*\)\",/\1/' | head -n 1)
+GATEWAY_IP=$(docker inspect backend-test | grep \"Gateway\":\ \" | sed 's/.*Gateway\":\ \"\([^-]*\)\",/\1/' | head -n 1)
 
 # if [ "$(curl -s $GATEWAY_IP:8080/services/groups)" != "$groups" ]; then
 #   echo "failed to load groups"