From 91f9059263fedfe72fb68e521dbd8bbe3b2346ca Mon Sep 17 00:00:00 2001
From: Lixia Chen <lixia.chen@huawei.com>
Date: Thu, 15 Apr 2021 09:33:07 -0400
Subject: [PATCH] Fix shellcheck warnings

---
 tests/ut/python/cachetests/cachetest.sh     |  2 +-
 tests/ut/python/cachetests/cachetest_cpp.sh |  4 ++--
 tests/ut/python/cachetests/cachetest_lib.sh | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/ut/python/cachetests/cachetest.sh b/tests/ut/python/cachetests/cachetest.sh
index 5a6e7b9c453..efea9824e2d 100755
--- a/tests/ut/python/cachetests/cachetest.sh
+++ b/tests/ut/python/cachetests/cachetest.sh
@@ -15,7 +15,7 @@
 # ============================================================================
 
 # This script is the driver of the individual test scenarios
-CURRPATH=$(cd "$(dirname $0)"; pwd)
+CURRPATH=$(cd "$(dirname $0)" || exit; pwd)
 
 echo "----------------------------------------------"
 echo "Invalid syntax and cache_admin failure testing"
diff --git a/tests/ut/python/cachetests/cachetest_cpp.sh b/tests/ut/python/cachetests/cachetest_cpp.sh
index b1121f56bd9..1b94cab30be 100755
--- a/tests/ut/python/cachetests/cachetest_cpp.sh
+++ b/tests/ut/python/cachetests/cachetest_cpp.sh
@@ -47,7 +47,7 @@ HandleRcExit $? 1 1
 export SESSION_ID=$session_id
 
 test_count=$(($test_count+1))
-cd ${UT_TEST_DIR} 
+cd ${UT_TEST_DIR} || exit
 cmd="${UT_TEST_DIR}/ut_tests"
 echo "Test ${test_count}: ${cmd}"
 MsgEnter "Run test ${test_count}"
@@ -62,7 +62,7 @@ fi
 echo
 HandleRcExit $rc 1 0
 
-cd ${CURRPATH}
+cd ${CURRPATH} || exit
 
 StopServer
 HandleRcExit $? 1 0
diff --git a/tests/ut/python/cachetests/cachetest_lib.sh b/tests/ut/python/cachetests/cachetest_lib.sh
index 25aa4b00056..c1a9167e94b 100755
--- a/tests/ut/python/cachetests/cachetest_lib.sh
+++ b/tests/ut/python/cachetests/cachetest_lib.sh
@@ -18,9 +18,9 @@
 # test scenarios for cache op testing.
 
 # Set any path variables here
-CURRPATH=$(cd "$(dirname $0)"; pwd)
-TESTPATH=$(cd "${CURRPATH}/../dataset"; pwd)
-PROJECT_PATH=$(cd "${CURRPATH}/../../../../"; pwd)
+CURRPATH=$(cd "$(dirname $0)" || exit; pwd)
+TESTPATH=$(cd "${CURRPATH}/../dataset" || exit; pwd)
+PROJECT_PATH=$(cd "${CURRPATH}/../../../../" || exit; pwd)
 
 if [ "x${BUILD_PATH}" == "x" ]; then
    BUILD_PATH=${PROJECT_PATH}/build
@@ -202,13 +202,13 @@ PytestCmd()
    if [ ${rc} -ne 0 ]; then
       MsgFail "FAILED"
       MsgError "pytest call had failure!" "${rc}" "${result}"
-      cd ${CURRPATH}
+      cd ${CURRPATH} || exit
       return 1
    else
       MsgOk "OK"
    fi
    echo
-   cd ${CURRPATH}
+   cd ${CURRPATH} || exit
    return 0
 }