From 3fc355eb16dfbd7ce7df25eb0bc5fe138a20b85b Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 23 Mar 2017 16:17:05 +0800 Subject: make unittest execution more user-friendly allow users use their existed venv manage all test-related libs in test-requirements.txt Change-Id: I39a63833e4a1f4f088afa045a83bf12cd01da167 Signed-off-by: SerenaFeng --- testapi/run_test.sh | 14 ++++++++------ testapi/test-requirements.txt | 5 +---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/testapi/run_test.sh b/testapi/run_test.sh index 4efc7af..1e05dd6 100755 --- a/testapi/run_test.sh +++ b/testapi/run_test.sh @@ -8,15 +8,17 @@ SCRIPTDIR=`dirname $0` echo "Running unit tests..." # Creating virtual environment -virtualenv $SCRIPTDIR/testapi_venv -source $SCRIPTDIR/testapi_venv/bin/activate +if [ ! -z $VIRTUAL_ENV ]; then + venv=$VIRTUAL_ENV +else + venv=$SCRIPTDIR/.venv + virtualenv $venv +fi +source $venv/bin/activate # Install requirements pip install -r $SCRIPTDIR/requirements.txt -pip install coverage -pip install nose>=1.3.1 -pip install pytest -pip install mock +pip install -r $SCRIPTDIR/test-requirements.txt find . -type f -name "*.pyc" -delete diff --git a/testapi/test-requirements.txt b/testapi/test-requirements.txt index 4633ad6..645687b 100644 --- a/testapi/test-requirements.txt +++ b/testapi/test-requirements.txt @@ -2,10 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -tox mock pytest -pytest-cov coverage -pykwalify -pip_check_reqs +nose>=1.3.1 -- cgit 1.2.3-korg