summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-03 12:39:19 +0000
committerGerrit Code Review <review@openstack.org>2018-08-03 12:39:19 +0000
commit4c3456b4b8f5a720c93b216c8eafffc33a1bef19 (patch)
tree09f2e2251148fc8c26bed88e154b27cfbffe39d8
parentdba8f86c6835d75a370438e90d76ed033fbaef38 (diff)
parentd008bbcab59eda68cf83072d986c42d50664c576 (diff)
Merge "Switch to using stestr"
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini3
2 files changed, 2 insertions, 3 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index c0cf4e9..53b3732 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
9coverage!=4.4,>=4.0 # Apache-2.0 9coverage!=4.4,>=4.0 # Apache-2.0
10mock>=2.0.0 # BSD 10mock>=2.0.0 # BSD
11funcsigs>=1.0.0;python_version=='2.7' or python_version=='2.6' # Apache-2.0 11funcsigs>=1.0.0;python_version=='2.7' or python_version=='2.6' # Apache-2.0
12os-testr>=1.0.0 # Apache-2.0 12stestr>=1.0.0 # Apache-2.0
13oslotest>=3.2.0 # Apache-2.0 13oslotest>=3.2.0 # Apache-2.0
14testrepository>=0.0.18 # Apache-2.0/BSD 14testrepository>=0.0.18 # Apache-2.0/BSD
15SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT 15SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
diff --git a/tox.ini b/tox.ini
index 65716aa..de9953d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,8 +22,7 @@ deps =
22 .[jira_plugin] 22 .[jira_plugin]
23commands = 23commands =
24 find . -type f -name "*.pyc" -delete 24 find . -type f -name "*.pyc" -delete
25 rm -Rf .testrepository/times.dbm 25 stestr run {posargs}
26 ostestr {posargs}
27 26
28[testenv:cover] 27[testenv:cover]
29basepython = python3 28basepython = python3