From d6749dda9c553ee068aff7402d058e45ab082ef6 Mon Sep 17 00:00:00 2001 From: Ulas Kozat Date: Mon, 27 Jun 2016 11:38:09 -0700 Subject: refactored run.sh and changed its execution mode Change-Id: I761bf4b4995e4fc19253388af881df9f532c5cc1 Signed-off-by: Ulas Kozat --- tests/run.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) mode change 100644 => 100755 tests/run.sh diff --git a/tests/run.sh b/tests/run.sh old mode 100644 new mode 100755 index b9ec9ae..695f0da --- a/tests/run.sh +++ b/tests/run.sh @@ -55,8 +55,21 @@ clean_directories() { fi } +cleanup() { + set +e + echo "cleanup..." + + echo "Stopping Domino Client 1..." + stop_client1 + + echo "Stopping Domino Server..." + stop_server +} + echo "domino/tests/run.sh has been executed." +trap cleanup EXIT + echo "Cleaning residue files and folders from previous runs..." clean_directories @@ -97,11 +110,11 @@ python domino-cli.py $CLIENT1_CLIPORT publish -t "$toscafile_test1" sleep 5 -echo "Stopping Domino Client 1..." -stop_client1 +#echo "Stopping Domino Client 1..." +#stop_client1 -echo "Stopping Domino Server..." -stop_server +#echo "Stopping Domino Server..." +#stop_server cut -d " " -f 4- "$client1_log" > file1 #will use the form below to declare success or failure -- cgit 1.2.3-korg