From 5499261fe55223273ed18036643128259cae1c02 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Wed, 9 Dec 2020 00:11:57 -0800
Subject: [PATCH] fix: bring back previous change to functional test script

---
 run_functional_tests.sh | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/run_functional_tests.sh b/run_functional_tests.sh
index 9dd1709a0..adea42477 100755
--- a/run_functional_tests.sh
+++ b/run_functional_tests.sh
@@ -16,11 +16,10 @@
 #
 
 function run_minio_server() {
-    if [ -f tests/functional/minio ]; then
-        rm -f tests/functional/minio
+    if [ ! -f tests/functional/minio ]; then
+        wget --quiet --output-document tests/functional/minio https://dl.min.io/server/minio/release/linux-amd64/minio
+        chmod +x tests/functional/minio
     fi
-    wget --quiet --output-document tests/functional/minio https://dl.min.io/server/minio/release/linux-amd64/minio
-    chmod +x tests/functional/minio
 
     export MINIO_ACCESS_KEY=minio
     export MINIO_SECRET_KEY=minio123
@@ -34,9 +33,19 @@ function run_minio_server() {
     tests/functional/minio server --config-dir tests/functional/.cfg tests/functional/.d{1...4} >tests/functional/minio.log 2>&1 &
 }
 
-run_minio_server
-sleep 3
+if [ -z ${SERVER_ENDPOINT+x} ]; then
+    run_minio_server
+    MINIO_PID=$!
+    trap 'kill -9 ${MINIO_PID} 2>/dev/null' INT
 
-pip install --user .
-SECRET_KEY=minio123 ACCESS_KEY=minio SERVER_ENDPOINT=localhost:9000 ENABLE_HTTPS=0 MINT_MODE=full PYTHONPATH=$PWD python tests/functional/tests.py
-pkill -9 minio
+    export MINT_MODE=full
+    export SERVER_ENDPOINT=localhost:9000
+    export ACCESS_KEY=minio
+    export SECRET_KEY=minio123
+    export ENABLE_HTTPS=0
+fi
+
+PYTHONPATH=$PWD python tests/functional/tests.py
+if [ -n "$MINIO_PID" ]; then
+    kill -9 "$MINIO_PID" 2>/dev/null
+fi