aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/cover.sh32
-rwxr-xr-xtools/run_tests.sh5
2 files changed, 20 insertions, 17 deletions
diff --git a/tools/cover.sh b/tools/cover.sh
index 780a85a22..c6e928d1a 100644
--- a/tools/cover.sh
+++ b/tools/cover.sh
@@ -42,17 +42,17 @@ run_coverage_test() {
git checkout HEAD^
baseline_report=$(mktemp -t yardstick_coverageXXXXXXX)
- ls -l .testrepository
- # workaround 'db type could not be determined' bug
- # https://bugs.launchpad.net/testrepository/+bug/1229445
- rm -rf .testrepository
find . -type f -name "*.pyc" -delete
- #python setup.py testr --coverage --testr-args=""
- python setup.py testr --coverage --slowest --testr-args="$*"
- testr failing
- coverage report > ${baseline_report}
+ # 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 ./yardstick/tests/unit
+ coverage combine
+
+ # Temporarily omit yardstick/tests from the report
+ coverage report --omit=yardstick/tests/*/* > ${baseline_report}
+ coverage erase
# debug awk
tail -1 ${baseline_report}
@@ -69,17 +69,17 @@ run_coverage_test() {
# Generate and save coverage report
current_report=$(mktemp -t yardstick_coverageXXXXXXX)
- ls -l .testrepository
- # workaround 'db type could not be determined' bug
- # https://bugs.launchpad.net/testrepository/+bug/1229445
- rm -rf .testrepository
find . -type f -name "*.pyc" -delete
- #python setup.py testr --coverage --testr-args=""
- python setup.py testr --coverage --slowest --testr-args="$*"
- testr failing
- coverage report > ${current_report}
+ # 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 ./yardstick/tests/unit
+ coverage combine
+
+ # Temporarily omit yardstick/tests from the report
+ coverage report --omit=yardstick/tests/*/* > ${current_report}
+ coverage erase
rm -rf cover-$PY_VER
coverage html -d cover-$PY_VER
diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index f253327e5..ddb5e55af 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -29,8 +29,10 @@ 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 yardstick/tests/unit >> $logfile 2>&1
else
python -m unittest discover -v -s tests/unit
+ python -m unittest discover -v -s yardstick/tests/unit
fi
if [ $? -ne 0 ]; then
@@ -53,7 +55,8 @@ run_coverage() {
run_functional_test() {
mkdir -p .testrepository
- python -m subunit.run discover tests/functional > .testrepository/subunit.log
+ python -m subunit.run discover yardstick/tests/functional > .testrepository/subunit.log
+ python -m subunit.run discover tests/functional >> .testrepository/subunit.log
subunit2pyunit < .testrepository/subunit.log
EXIT_CODE=$?