diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cover.sh | 10 | ||||
| -rwxr-xr-x | tools/run_tests.sh | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tools/cover.sh b/tools/cover.sh index d8170ba..588ce08 100644 --- a/tools/cover.sh +++ b/tools/cover.sh @@ -42,13 +42,11 @@ run_coverage_test() { find . -type f -name "*.pyc" -delete - # Temporarily run tests from two directories, until all tests have moved - coverage run -p -m unittest discover ./tests/unit coverage run -p -m unittest discover ./vnftest/tests/unit/core coverage run -p -m unittest discover ./vnftest/tests/unit/onap + coverage run -p -m unittest discover ./vnftest/tests/unit/common coverage combine - # Temporarily omit vnftest/tests from the report coverage report > ${baseline_report} coverage erase @@ -70,14 +68,12 @@ run_coverage_test() { find . -type f -name "*.pyc" -delete - # Temporarily run tests from two directories, until all tests have moved - coverage run -p -m unittest discover ./tests/unit coverage run -p -m unittest discover ./vnftest/tests/unit/core coverage run -p -m unittest discover ./vnftest/tests/unit/onap + coverage run -p -m unittest discover ./vnftest/tests/unit/common coverage combine - # Temporarily omit vnftest/tests from the report - coverage report --omit=vnftest/tests/*/* > ${current_report} + coverage report > ${current_report} coverage erase rm -rf cover-$PY_VER diff --git a/tools/run_tests.sh b/tools/run_tests.sh index 4f7aea3..e225589 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -35,9 +35,9 @@ run_tests() { echo "Running unittest ... " if [ $FILE_OPTION == "f" ]; then - python -m unittest discover -v -s tests/unit > $logfile 2>&1 + python -m unittest discover -v -s vnftest/tests/unit > $logfile 2>&1 else - python -m unittest discover -v -s tests/unit + python -m unittest discover -v -s vnftest/tests/unit fi if [ $? -ne 0 ]; then |