Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added hw_vif_multiqueue_enabled metadata to the added samplevnfs image in OpenStack.
[yardstick.git]
/
run_tests.sh
diff --git
a/run_tests.sh
b/run_tests.sh
index
b4ddc94
..
b3cbfb1
100755
(executable)
--- a/
run_tests.sh
+++ b/
run_tests.sh
@@
-9,10
+9,19
@@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-# Run yardstick's
test suite(s)
+# Run yardstick's
flake8, unit, coverage, functional test
getopts ":f" FILE_OPTION
getopts ":f" FILE_OPTION
+# don't write .pyc files this can cause odd unittest results
+export PYTHONDONTWRITEBYTECODE=1
+
+PY_VER="py$( python --version | sed 's/[^[:digit:]]//g' | cut -c-2 )"
+export PY_VER
+
+COVER_DIR_NAME="./tests/ci/"
+export COVER_DIR_NAME
+
run_flake8() {
echo "Running flake8 ... "
logfile=test_results.log
run_flake8() {
echo "Running flake8 ... "
logfile=test_results.log
@@
-33,7
+42,10
@@
run_flake8() {
fi
}
fi
}
+
run_tests() {
run_tests() {
+ echo "Get external libs needed for unit test"
+
echo "Running unittest ... "
if [ $FILE_OPTION == "f" ]; then
python -m unittest discover -v -s tests/unit > $logfile 2>&1
echo "Running unittest ... "
if [ $FILE_OPTION == "f" ]; then
python -m unittest discover -v -s tests/unit > $logfile 2>&1
@@
-53,6
+65,14
@@
run_tests() {
fi
}
fi
}
+run_coverage() {
+ # don't re-run coverage on both py27 py3, it takes too long
+ if [[ -z $SKIP_COVERAGE ]] ; then
+ source $COVER_DIR_NAME/cover.sh
+ run_coverage_test
+ fi
+}
+
run_functional_test() {
mkdir -p .testrepository
run_functional_test() {
mkdir -p .testrepository
@@
-62,8
+82,15
@@
run_functional_test() {
EXIT_CODE=$?
subunit-stats < .testrepository/subunit.log
EXIT_CODE=$?
subunit-stats < .testrepository/subunit.log
- exit $EXIT_CODE
+ if [ $EXIT_CODE -ne 0 ]; then
+ exit 1
+ else
+ echo "OK"
+ fi
}
}
+
+
run_flake8
run_tests
run_flake8
run_tests
+run_coverage
run_functional_test
run_functional_test