update test script

bin/test.sh

 #!/bin/bash
 
+cd ../
+cd sure_tosca-flask-server && venv/bin/pip3 install -r test-requirements.txt && venv/bin/python3 -m unittest discover
+if [ $? -eq 0 ]
+then
+  echo "------- sure_tosca-flask-server tests successful------"
+  docker build -t sure-tosca:3.0.0 .
+  docker tag sure-tosca:3.0.0 qcdis/sure-tosca:3.0.0
+else
+  echo "sure_tosca-flask-server tests Failed"
+  exit 1
+fi
+
 
 docker stack deploy conf-test -c ../docker-compose/docker-compose-test.yml
 
-sure_tosca_url=http://localhost:8081
+sure_tosca_url=http://localhost:8081/tosca-sure/1.0.0/ui
 
+echo "Waiting for $sure_tosca_url"
 count=0 && until $(curl --output /dev/null --silent --head --fail "$sure_tosca_url"); do printf '.' && sleep 10 && count=$((count+1)) && if [ $count -gt 5 ]; then break; fi; done  
 
 
@@ -17,33 +30,53 @@ fi
 
 cd ../
 mvn test
-status=$?
-[ $status -eq 0 ] && echo "------- Java tests successful------" || exit -1
+if [ $? -eq 0 ]
+then
+  echo "------- Java tests successful------"
+else
+  echo "Java tests Failed"
+  exit 1
+fi
 
 cd planner && venv/bin/python3 -m unittest discover
-status=$?
-[ $status -eq 0 ] && echo "------- Planner tests successful------" || exit -1
+if [ $? -eq 0 ]
+then
+  echo "------- Planner tests successful------"
+else
+  echo "Planner tests Failed"
+  exit 1
+fi
 
-cd ../
-cd sure_tosca-flask-server && venv/bin/python3 -m unittest discover
-status=$?
-[ $status -eq 0 ] && echo "------- sure_tosca-flask-server tests successful------" || exit -1
 
 cd ../
 cd sure_tosca-client_python_stubs  && venv/bin/python3 -m unittest discover
-status=$?
-[ $status -eq 0 ] && echo "------- sure_tosca-client_python_stubs tests successful------" || exit -1
-
+if [ $? -eq 0 ]
+then
+  echo "------- sure_tosca-client_python_stubs tests successful------"
+else
+  echo "sure_tosca-client_python_stubs tests Failed"
+  exit 1
+fi
 
 cd ../
 cd semaphore-python-client-generated  && venv/bin/python3 -m unittest discover
-status=$?
-[ $status -eq 0 ] && echo "------- semaphore-python-client-generated tests successful------" || exit -1
-
+if [ $? -eq 0 ]
+then
+  echo "------- semaphore-python-client-generated tests successful ------"
+else
+  echo "semaphore-python-client-generated tests Failed"
+  exit 1
+fi
 
 cd ../
 cd deployer  && venv/bin/python3 -m unittest discover
-status=$?
-[ $status -eq 0 ] && echo "------- deployer tests successful------" || exit -1
+if [ $? -eq 0 ]
+then
+  echo "------- deployer tests successful ------"
+else
+  echo "deployer tests Failed"
+  exit 1
+fi
+
 
 docker stack rm conf-test