diff options
| -rwxr-xr-x | tests/run.sh | 13 | ||||
| -rwxr-xr-x | tests/run_multinode.sh | 13 |
2 files changed, 4 insertions, 22 deletions
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 diff --git a/tests/run_multinode.sh b/tests/run_multinode.sh index 89f2d3f..7da8f36 100755 --- a/tests/run_multinode.sh +++ b/tests/run_multinode.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 |