Merge "More usage of ostestr and cleanup an unused dependency"

This commit is contained in:
Jenkins
2017-03-20 16:04:47 +00:00
committed by Gerrit Code Review
2 changed files with 6 additions and 7 deletions

View File

@ -25,7 +25,6 @@ testrepository>=0.0.18 # Apache-2.0/BSD
testresources>=0.2.4 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
tempest-lib>=0.14.0 # Apache-2.0
bandit>=1.1.0 # Apache-2.0
openstackdocstheme>=1.5.0 # Apache-2.0
gabbi>=1.26.1 # Apache-2.0

12
tox.ini
View File

@ -20,20 +20,20 @@ commands =
find . -type f -name "*.pyc" -delete
rm -Rf .testrepository/times.dbm
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_DEBUG GENERATE_HASHES
# there is also secret magic in pretty_tox.sh which lets you run in a fail only
# there is also secret magic in subunit-trace which lets you run in a fail only
# mode. To do this define the TRACE_FAILONLY environmental variable.
[testenv:py27]
commands =
{[testenv]commands}
bash tools/pretty_tox.sh '{posargs}'
env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler'
ostestr '{posargs}'
env TEST_OSPROFILER=1 ostestr 'nova.tests.unit.test_profiler'
[testenv:py35]
commands =
{[testenv]commands}
bash tools/pretty_tox3.sh '{posargs}'
env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler'
env TEST_OSPROFILER=1 ostestr 'nova.tests.unit.test_profiler'
[testenv:pep8]
basepython = python2.7
@ -63,7 +63,7 @@ setenv = VIRTUAL_ENV={envdir}
LANGUAGE=en_US
commands =
find . -type f -name "*.pyc" -delete
bash tools/pretty_tox.sh '{posargs}'
ostestr '{posargs}'
# TODO(gcb) Merge this into [testenv:functional] when functional tests are gating
# with python 3.5
@ -86,7 +86,7 @@ setenv = VIRTUAL_ENV={envdir}
LANGUAGE=en_US
commands =
find . -type f -name "*.pyc" -delete
bash tools/pretty_tox.sh '{posargs}'
ostestr '{posargs}'
[testenv:genconfig]
commands = oslo-config-generator --config-file=etc/nova/nova-config-generator.conf