summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-23 01:39:08 +0000
committerGerrit Code Review <review@openstack.org>2013-01-23 01:39:08 +0000
commit1ab992d2aaa7efc9b1a6af9bf2aad42e6265a040 (patch)
treee8a8d6a552c63dad92e7d5681232b169a539ef12
parent697e4c7332917af01a022ee877c640e9f411a356 (diff)
parentcc88380dfe11d4a96ba3140b16e97abad7550f34 (diff)
downloadnova-1ab992d2aaa7efc9b1a6af9bf2aad42e6265a040.tar.gz
nova-1ab992d2aaa7efc9b1a6af9bf2aad42e6265a040.tar.xz
nova-1ab992d2aaa7efc9b1a6af9bf2aad42e6265a040.zip
Merge "Fix nova coverage."
-rwxr-xr-xrun_tests.sh2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/run_tests.sh b/run_tests.sh
index 39176d78b..8a7bce63b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -81,7 +81,7 @@ function run_tests {
if [ $coverage -eq 1 ]; then
# Do not test test_coverage_ext when gathering coverage.
if [ "x$testrargs" = "x" ]; then
- testrargs="^(?!.*test_coverage_ext).*$"
+ testrargs="^(?!.*test.*coverage).*$"
fi
export PYTHON="${wrapper} coverage run --source nova --parallel-mode"
fi
diff --git a/tox.ini b/tox.ini
index 58468accb..e98f30151 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,7 @@ commands = python tools/flakes.py nova
# tests conflict with coverage.
commands =
python setup.py testr --coverage \
- --testr-args='^(?!.*test_coverage_ext).*$'
+ --testr-args='^(?!.*test.*coverage).*$'
[testenv:venv]
commands = {posargs}