X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Frun.sh;fp=tests%2Frun.sh;h=7da8f36614ed17b84b1e8140bb58af5c9fff3b45;hb=bd933de68d560a4f412ef0b8ef0a7928cb4f7bfa;hp=89f2d3f7db2783751acd4d5539eeeb6e58979444;hpb=bd900ddc3911c4c2bd0aa738ed48db0a075bcebb;p=domino.git diff --git a/tests/run.sh b/tests/run.sh index 89f2d3f..7da8f36 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -24,19 +24,14 @@ client1_log=./tests/logdata/client1.log client2_log=./tests/logdata/client2.log server_log=./tests/logdata/server.log -install_dependency() { - sudo pip install tosca-parser - sudo pip install heat-translator -} - start_server() { - pgrep -f "python DominoServer.py" && return 0 + pgrep -f "python DominoServer.py" && return 0 python DominoServer.py --log "$LOGLEVEL" > "$server_log" 2>&1 & } stop_server() { - pgrep -f "python DominoServer.py" || return 0 + pgrep -f "python DominoServer.py" || return 0 kill $(pgrep -f "python DominoServer.py") #cat server.log } @@ -103,10 +98,6 @@ echo "Cleaning residue files and folders from previous runs..." clean_directories sleep 1 -echo "Installing dependencies..." -install_dependency -sleep 1 - echo "Launching Domino Server..." start_server sleep 1