Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
decouple the mutual-dependence of config.py and server.py
[releng.git]
/
utils
/
test
/
testapi
/
run_test.sh
diff --git
a/utils/test/testapi/run_test.sh
b/utils/test/testapi/run_test.sh
index
51db09f
..
1e05dd6
100755
(executable)
--- a/
utils/test/testapi/run_test.sh
+++ b/
utils/test/testapi/run_test.sh
@@
-8,13
+8,17
@@
SCRIPTDIR=`dirname $0`
echo "Running unit tests..."
# Creating virtual environment
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
# Install requirements
pip install -r $SCRIPTDIR/requirements.txt
-pip install coverage
-pip install nose>=1.3.1
+pip install -r $SCRIPTDIR/test-requirements.txt
find . -type f -name "*.pyc" -delete
find . -type f -name "*.pyc" -delete