summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test-requirements.txt1
-rw-r--r--tox.ini4
2 files changed, 3 insertions, 2 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 24f5c68e..f82e48d7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,6 +11,7 @@ oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.5.1 # Apache-2.0
requests-mock>=0.6.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+os-testr>=0.1.0
testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0
WebOb>=1.2.3
diff --git a/tox.ini b/tox.ini
index 2ee9cdbc..ff91d890 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,8 +9,8 @@ install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --testr-args='{posargs}'
-whitelist_externals = bash
+commands = ostestr {posargs}
+whitelist_externals = ostestr
[testenv:pep8]
commands = flake8