From f248c0ef93bad271ea864b2873eba3602ba6ab9a Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Fri, 8 Apr 2016 10:35:01 +0200 Subject: [PATCH] use os-testr instead of testr Make use of the testr OpenStack wrapper ostestr instead of testr directly. Closes-Bug: #1566353 Change-Id: I85972dd09384dad22e3b78b0365b2026f1baef5c Signed-off-by: Danny Al-Gaaf --- test-requirements.txt | 2 ++ tox.ini | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index f8c5fac89e..e4cc90f5c8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -22,6 +22,8 @@ testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT psutil<2.0.0,>=1.1.1 # BSD oslotest>=1.10.0 # Apache-2.0 +os-testr>=0.4.1 # Apache-2.0 + # Optional packages that should be installed when testing PyMySQL>=0.6.2 # MIT License psycopg2>=2.5 # LGPL/ZPL diff --git a/tox.ini b/tox.ini index 196f2bec54..07ffe2f1b7 100644 --- a/tox.ini +++ b/tox.ini @@ -8,9 +8,9 @@ setenv = VIRTUAL_ENV={envdir} usedevelop = True install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} deps = -r{toxinidir}/test-requirements.txt -commands = lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}' +commands = ostestr --slowest {posargs} whitelist_externals = bash -passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY +passenv = *_proxy *_PROXY [testenv:releasenotes] # NOTE(jaegerandi): this target does not use constraints because