From 3b673dda6a5306e726793163930f2bae5e5f3934 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Fri, 16 Feb 2018 17:22:59 -0500 Subject: [PATCH] Remove single quotes from posargs on stestr run commands This commit removes the single quotes from all the stestr run commands in the tox.ini. These were originally added as a workaround from the ostestr days to ensure people could run a subset of tests with a regex like: tox -epy27 regex With the switch to stestr this is no longer needed because stestr treats extra arguments as a filter regex. Quoting the posargs has a negative effect because '--' parameters are treated as a string on input instead of a parameter. Fixing this also uncovered another issue in the stestr commands for the functional jobs. The CLI arg for stestr versions <=1.1.0 is --group_regex not --group-regex. This commit fixes this to make those jobs pass without the quotes. Change-Id: I512a517fa6890b29de24060376b4d7e061dc3add --- tox.ini | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index c8556350b92c..0abed6720aee 100644 --- a/tox.ini +++ b/tox.ini @@ -27,14 +27,14 @@ passenv = OS_DEBUG GENERATE_HASHES [testenv:py27] commands = {[testenv]commands} - stestr run '{posargs}' + stestr run {posargs} env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler' stestr slowest [testenv:py35] commands = {[testenv]commands} - stestr run --blacklist-file=tests-py3.txt '{posargs}' + stestr run --blacklist-file=tests-py3.txt {posargs} env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler' @@ -73,7 +73,7 @@ commands = # special way. See the following for more details. # http://stestr.readthedocs.io/en/latest/MANUAL.html#grouping-tests # https://gabbi.readthedocs.io/en/latest/#purpose - stestr --test-path=./nova/tests/functional --group-regex=nova\.tests\.functional\.api\.openstack\.placement\.test_placement_api(?:\.|_)([^_]+) run '{posargs}' + stestr --test-path=./nova/tests/functional --group_regex=nova\.tests\.functional\.api\.openstack\.placement\.test_placement_api(?:\.|_)([^_]+) run {posargs} stestr slowest # TODO(gcb) Merge this into [testenv:functional] when functional tests are gating @@ -92,7 +92,7 @@ commands = # special way. See the following for more details. # http://stestr.readthedocs.io/en/latest/MANUAL.html#grouping-tests # https://gabbi.readthedocs.io/en/latest/#purpose - stestr --test-path=./nova/tests/functional --group-regex=nova\.tests\.functional\.api\.openstack\.placement\.test_placement_api(?:\.|_)([^_]+) run '{posargs}' + stestr --test-path=./nova/tests/functional --group_regex=nova\.tests\.functional\.api\.openstack\.placement\.test_placement_api(?:\.|_)([^_]+) run {posargs} [testenv:api-samples] usedevelop = True @@ -101,7 +101,7 @@ setenv = {[testenv]setenv} PYTHONHASHSEED=0 commands = find . -type f -name "*.pyc" -delete - stestr --test-path=./nova/tests/functional/api_sample_tests run '{posargs}' + stestr --test-path=./nova/tests/functional/api_sample_tests run {posargs} stestr slowest [testenv:genconfig] @@ -118,7 +118,7 @@ setenv = {[testenv]setenv} commands = coverage erase find . -type f -name "*.pyc" -delete - stestr run '{posargs}' + stestr run {posargs} coverage combine coverage html -d cover coverage xml -o cover/coverage.xml