From 7b94d3c1417578f0aa7653144cdf212b85ff4eff Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Tue, 5 Apr 2016 16:36:45 +0200 Subject: [PATCH] tox: use os-testr instead of testr Make use of the testr OpenStack wrapper ostestr instead of testr directly. Closes-Bug: #1566354 Change-Id: I396be386c34e5e2a6587921aacd8eefa4622713a Signed-off-by: Danny Al-Gaaf --- test-requirements.txt | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 8c6627d3..d66c378d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,6 +16,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT oslotest>=1.10.0 # Apache-2.0 +os-testr>=0.4.1 # Apache-2.0 # this is required for the docs build jobs sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD diff --git a/tox.ini b/tox.ini index 5307d16e..9659dad3 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ install_command = pip install --allow-all-external --allow-insecure netaddr -U { deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt .[s3,vmware,swift,cinder] -commands = python setup.py testr --slowest --testr-args='{posargs}' +commands = ostestr --slowest {posargs} [testenv:docs] commands = python setup.py build_sphinx