diff --git a/test-requirements.txt b/test-requirements.txt index 1ce69dd2b..ed48f2ef0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -23,6 +23,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT oslo.db>=4.15.0 # Apache-2.0 testresources>=0.2.4 # Apache-2.0/BSD +os-testr>=0.8.0 # Apache-2.0 # Documentation sphinx!=1.3b1,<1.4,>=1.2.1 # BSD diff --git a/tox.ini b/tox.ini index 2a26553a6..037f286a8 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete - python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}' + ostestr --concurrency 1 {posargs} whitelist_externals = find [testenv:pypy] @@ -25,7 +25,7 @@ setenv = {[testenv]setenv} setenv = {[testenv]setenv} ZAQAR_TEST_INTEGRATION=1 OS_TEST_PATH=./zaqar/tests/functional -commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}' +commands = ostestr --concurrency 1 {posargs} [testenv:pep8] commands = flake8