diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-29 20:47:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-29 20:47:09 +0000 |
| commit | 3ee99dc02a025b6d8d48aa55dbf5af1bed8642f9 (patch) | |
| tree | 7320677b54b7dbd9a043654326414b3d52bd8f7b | |
| parent | 7d3eeb299b3bcda4b7f65118c54a32fc1d9047c2 (diff) | |
| parent | ae29f7f459afb567abc36bd0627157e7c84c7568 (diff) | |
| download | python-openstackclient-3ee99dc02a025b6d8d48aa55dbf5af1bed8642f9.tar.gz | |
Merge "Use ostestr for test runs"
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 4 |
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 @@ -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 |