Fixing openstack-tox-cover
Cover was broken as part of the switch to stestr. Change-Id: Ia0eea9f966d15a62fffc1fcd76f8fd159808356f
This commit is contained in:
parent
126909925f
commit
4abe4041be
|
@ -12,10 +12,11 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
# This tool is borrowed from Rally project and revised to enhance Senlin
|
# This tool is borrowed from the Rally / Manila projects and revised to enhance
|
||||||
# coverage test.
|
# Senlin coverage test.
|
||||||
|
|
||||||
ALLOWED_EXTRA_MISSING=4
|
ALLOWED_EXTRA_MISSING=4
|
||||||
|
TESTR_ARGS="$*"
|
||||||
|
|
||||||
show_diff () {
|
show_diff () {
|
||||||
head -1 $1
|
head -1 $1
|
||||||
|
@ -33,8 +34,8 @@ fi
|
||||||
git checkout HEAD^
|
git checkout HEAD^
|
||||||
|
|
||||||
baseline_report=$(mktemp -t senlin_coverageXXXXXXX)
|
baseline_report=$(mktemp -t senlin_coverageXXXXXXX)
|
||||||
python setup.py test --coverage --testr-args="^(?!senlin\.tests\.tempest)"
|
find . -type f -name "*.py[c|o]" -delete && stestr run "$TESTR_ARGS" && coverage combine && coverage html -d cover
|
||||||
coverage report > $baseline_report
|
coverage report --ignore-errors > $baseline_report
|
||||||
cat $baseline_report
|
cat $baseline_report
|
||||||
if [ -d "cover-master" ]; then
|
if [ -d "cover-master" ]; then
|
||||||
rm -rf cover-master
|
rm -rf cover-master
|
||||||
|
@ -45,9 +46,10 @@ baseline_missing=$(awk 'END { print $3 }' $baseline_report)
|
||||||
# Checkout back and save coverage report
|
# Checkout back and save coverage report
|
||||||
git checkout -
|
git checkout -
|
||||||
|
|
||||||
|
# Generate and save coverage report
|
||||||
current_report=$(mktemp -t senlin_coverageXXXXXXX)
|
current_report=$(mktemp -t senlin_coverageXXXXXXX)
|
||||||
python setup.py test --coverage --testr-args="^(?!senlin\.tests\.tempest)"
|
find . -type f -name "*.py[c|o]" -delete && stestr run "$TESTR_ARGS" && coverage combine && coverage html -d cover
|
||||||
coverage report > $current_report
|
coverage report --ignore-errors > $current_report
|
||||||
cat $current_report
|
cat $current_report
|
||||||
current_missing=$(awk 'END { print $3 }' $current_report)
|
current_missing=$(awk 'END { print $3 }' $current_report)
|
||||||
|
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -54,7 +54,9 @@ commands =
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
PYTHON=coverage run --source senlin --parallel-mode
|
||||||
commands = {toxinidir}/tools/cover.sh {posargs}
|
commands = {toxinidir}/tools/cover.sh {posargs}
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
|
|
Loading…
Reference in New Issue