From 531abe778a18356113f4e457d7931993501eb6c1 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Wed, 13 Sep 2017 17:22:19 -0400 Subject: [PATCH] Cleanup running of osprofiler tests Now that we're using stestr directly we have more flexibility on how we run the osprofiler tests. This patch makes it run second without test discovery and combines the subunit output with the results of the previous full test run. Change-Id: I49db096dd3056a4fd2ec6e6603b59e70a8d25480 --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index e00693dc2df4..a34da80449e2 100644 --- a/tox.ini +++ b/tox.ini @@ -29,14 +29,15 @@ passenv = OS_DEBUG GENERATE_HASHES [testenv:py27] commands = {[testenv]commands} - env TEST_OSPROFILER=1 stestr run 'nova.tests.unit.test_profiler' stestr run {posargs} + env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler' [testenv:py35] commands = {[testenv]commands} - env TEST_OSPROFILER=1 stestr run 'nova.tests.unit.test_profiler' bash tools/pretty_tox3.sh '{posargs}' + env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler' + [testenv:pep8] basepython = python2.7