diff options
author | Zuul <zuul@review.openstack.org> | 2018-07-12 19:43:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-07-12 19:43:58 +0000 |
commit | 7b983c035c1e98e44edd7e13e89e044891196a9c (patch) | |
tree | e623288b406588bab7538a02d2231190ca2dfcad | |
parent | f52070c4a671ad6ec3585a1f224d82f971407881 (diff) | |
parent | 2da04caee69a1bd5499c9a81fa7a97813f20517c (diff) | |
download | python-saharaclient-7b983c035c1e98e44edd7e13e89e044891196a9c.tar.gz |
Merge "Switch to using stestr"
-rw-r--r-- | lower-constraints.txt | 4 | ||||
-rw-r--r-- | test-requirements.txt | 3 | ||||
-rw-r--r-- | tox.ini | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt index eb1c9e8..090f387 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -34,7 +34,6 @@ netifaces==0.10.4 openstacksdk==0.11.2 os-client-config==1.28.0 os-service-types==1.2.0 -os-testr==1.0.0 osc-lib==1.8.0 oslo.config==5.2.0 oslo.context==2.19.2 @@ -64,14 +63,13 @@ python-subunit==1.0.0 pytz==2013.6 PyYAML==3.12 requests==2.14.2 -requests-mock==1.1.0 +requests-mock==1.2.0 requestsexceptions==1.2.0 rfc3986==0.3.1 simplejson==3.5.1 six==1.10.0 stestr==1.0.0 stevedore==1.20.0 -testrepository==0.0.18 testtools==2.2.0 traceback2==1.4.0 unittest2==1.1.0 diff --git a/test-requirements.txt b/test-requirements.txt index 6dbca11..886ab37 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,5 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD oslotest>=3.2.0 # Apache-2.0 -os-testr>=1.0.0 # Apache-2.0 +stestr>=1.0.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD @@ -14,7 +14,7 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete - ostestr {posargs} + stestr run {posargs} whitelist_externals = find rm passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY |