From 9900273988aa36c1014b643846499fd7c8496df5 Mon Sep 17 00:00:00 2001
From: Biswajeeban Mishra <mishra@inf.u-szeged.hu>
Date: Thu, 7 Jan 2016 14:32:06 +0100
Subject: [PATCH] Changed testr to os-testr

Change-Id: I6dd478e3bac50cf5a2d0ad32af0e36c25c0df071
Related-Bug: #1525854
---
 test-requirements.txt | 3 ++-
 tox.ini               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 4faca21a0..91d2b593f 100644
--- 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
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index bcee22487..35795939b 100644
--- 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