diff options
| author | Clint Byrum <clint@fewbar.com> | 2013-04-24 20:07:37 -0700 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2013-04-30 13:51:31 -0700 |
| commit | 405510e2634dfe0005148b9fb041cfad2335e6e9 (patch) | |
| tree | 23f757d783126575726f9bc39643d2a75683c30f | |
| parent | 8b8525260df0e46ec26893e6149c4e930bf31aba (diff) | |
| download | heat-405510e2634dfe0005148b9fb041cfad2335e6e9.tar.gz | |
Use testr for running gate tests
Fixes bug 1172468
Change-Id: Ifd87e44d752b4b3c77b4ea8f38feceb03bccaebe
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | tools/test-requires | 2 | ||||
| -rw-r--r-- | tools/test-requires-rpm | 2 | ||||
| -rw-r--r-- | tox.ini | 7 |
4 files changed, 10 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 715c9605f..cd390541e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ AUTHORS ChangeLog templates/cloudformation-examples .tox +.coverage +cover +.testrepository diff --git a/tools/test-requires b/tools/test-requires index 1d1eb0c4b..0cbb4a1e1 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -3,8 +3,8 @@ distribute>=0.6.24 coverage mox==0.5.3 +testrepository>=0.0.13 nose -nosexcover openstack.nose_plugin>=0.7 paramiko pep8==1.3.4 diff --git a/tools/test-requires-rpm b/tools/test-requires-rpm index 9bf50802f..3874d1f79 100644 --- a/tools/test-requires-rpm +++ b/tools/test-requires-rpm @@ -3,8 +3,8 @@ python-setuptools python-coverage python-mox +python-testrepository python-nose -#nosexcover #openstack.nose_plugin>=0.7 python-pep8 python-sphinx @@ -5,7 +5,8 @@ envlist = py26,py27,pep8 setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/tools/pip-requires -r{toxinidir}/tools/test-requires -commands = nosetests -a tag='unit' +commands = + python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] commands = bash tools/run_pep8.sh @@ -14,7 +15,9 @@ commands = bash tools/run_pep8.sh commands = {posargs} [testenv:cover] -commands = nosetests --cover-erase --cover-package=heat --with-xcoverage -a tag='unit' +setenv = VIRTUAL_ENV={envdir} +commands = + python setup.py testr --coverage [tox:jenkins] downloadcache = ~/cache/pip |