diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-23 12:51:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-23 12:51:56 +0000 |
| commit | 66ee2ae49f3db77bc5492f3c8a2a49546af167c2 (patch) | |
| tree | 66a07d9a285b8b4a054e0b063d6259b4f8bd19c7 | |
| parent | efcda2a14f959f179717242c4c4c5106aad31f5a (diff) | |
| parent | 7c5b0989474959a6f10e687871b94ae4a3f62244 (diff) | |
| download | nova-66ee2ae49f3db77bc5492f3c8a2a49546af167c2.tar.gz nova-66ee2ae49f3db77bc5492f3c8a2a49546af167c2.tar.xz nova-66ee2ae49f3db77bc5492f3c8a2a49546af167c2.zip | |
Merge "Use setup.py testr to run testr in run_tests.sh."
| -rwxr-xr-x | run_tests.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/run_tests.sh b/run_tests.sh index 8a7bce63b..238f5e194 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -83,13 +83,17 @@ function run_tests { if [ "x$testrargs" = "x" ]; then testrargs="^(?!.*test.*coverage).*$" fi - export PYTHON="${wrapper} coverage run --source nova --parallel-mode" + TESTRTESTS="$TESTRTESTS --coverage" + else + TESTRTESTS="$TESTRTESTS --slowest" fi + # Just run the test suites in current environment set +e - TESTRTESTS="$TESTRTESTS $testrargs" + testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'` + TESTRTESTS="$TESTRTESTS --testr-args='$testrargs'" echo "Running \`${wrapper} $TESTRTESTS\`" - ${wrapper} $TESTRTESTS + bash -c "${wrapper} $TESTRTESTS" RESULT=$? set -e @@ -143,7 +147,7 @@ function run_pep8 { } -TESTRTESTS="testr run --parallel $testropts" +TESTRTESTS="python setup.py testr $testropts" if [ $never_venv -eq 0 ] then |