summaryrefslogtreecommitdiffstats
path: root/tools/cover.sh
diff options
context:
space:
mode:
authorEmma Foley <emma.l.foley@intel.com>2017-11-29 22:18:55 +0000
committerEmma Foley <emma.l.foley@intel.com>2018-01-11 14:04:15 +0000
commit5fcde48fcbac8840e128ebadb8acc563e4f3dc7b (patch)
treed27e857e3296500916c67f643316a6271f392f1f /tools/cover.sh
parentb1225dbbc53723741757810d3283258f157e20e4 (diff)
Run tests in yardstick/tests/
* Edit .testr.conf and tools/run_tests.sh * Run functional and unit tests in tests/ and yardstick/tests/ * Add yardstick/tests/unit/__init__.py and yardstick/tests/__init__.py * Update pylintrc rules to disable: * missing-docstring * fixme * protected-access Test will run in both tests/ and yardstick/tests/ initially Change-Id: Iccd0df0d1b85b5d08f7faa56669bc32687925f7e JIRA: YARDSTICK-837 Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Diffstat (limited to 'tools/cover.sh')
-rw-r--r--tools/cover.sh32
1 files changed, 16 insertions, 16 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