Merge "Changed testr to os-testr"

2016-01-18 08:21:40 +00:00
parent fd6ecc1b13 9900273988
commit 53d6d7d131
2 changed files with 3 additions and 2 deletions
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@ discover
 hacking>=0.10.2,<0.11
 mock>=1.2
 oslotest>=1.10.0  # Apache-2.0
+os-testr>=0.1.0
 python-subunit>=0.0.18
 testrepository>=0.0.18
 testscenarios>=0.4
@@ -18,4 +19,4 @@ sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 sphinxcontrib-pecanwsme>=0.8

 # For PyPI distribution
-twine
+twine
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps = -r{toxinidir}/requirements.txt
 commands =
  find . -type f -name "*.pyc" -delete
  find . -type d -name "__pycache__" -delete
-  python setup.py testr --slowest --testr-args='{posargs}'
+  ostestr --concurrency=6 {posargs}

 [testenv:pep8]
 commands = flake8