From 24fffaf712a8aed0f9b60e2c8f75ab5b47d152b8 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Thu, 13 Sep 2018 16:28:11 +0000
Subject: [PATCH] Migrate to stestr

Since we're touching the coverage jobs, also fix the coverage
configuration.

Change-Id: I04d3da810c8a10c9d5a04b456d8bef10fc4f798f
---
 oslo.{{cookiecutter.module_name}}/.coveragerc |  4 ++--
 oslo.{{cookiecutter.module_name}}/tox.ini     | 22 ++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/oslo.{{cookiecutter.module_name}}/.coveragerc b/oslo.{{cookiecutter.module_name}}/.coveragerc
index d172ef9..f584264 100644
--- a/oslo.{{cookiecutter.module_name}}/.coveragerc
+++ b/oslo.{{cookiecutter.module_name}}/.coveragerc
@@ -1,7 +1,7 @@
 [run]
 branch = True
-source = {{cookiecutter.module_name}}
-omit = {{cookiecutter.module_name}}/tests/*,{{cookiecutter.module_name}}/openstack/*
+source = oslo_{{cookiecutter.module_name}}
+omit = oslo_{{cookiecutter.module_name}}/tests/*
 
 [report]
 ignore_errors = True
diff --git a/oslo.{{cookiecutter.module_name}}/tox.ini b/oslo.{{cookiecutter.module_name}}/tox.ini
index 500b7da..b5c7e79 100644
--- a/oslo.{{cookiecutter.module_name}}/tox.ini
+++ b/oslo.{{cookiecutter.module_name}}/tox.ini
@@ -11,7 +11,7 @@ install_command =
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:common-constraints]
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
@@ -31,11 +31,27 @@ install_command = {[testenv:common-constraints]install_command}
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --testr-args='{posargs}'
+deps = {[testenv]deps}
+    coverage
+setenv =
+    PYTHON=coverage run --source oslo_{{cookiecutter.module_name}} --parallel-mode
+commands =
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:cover-constraints]
 install_command = {[testenv:common-constraints]install_command}
-commands = python setup.py test --coverage --testr-args='{posargs}'
+deps = {[testenv]deps}
+    coverage
+setenv =
+    PYTHON=coverage run --source oslo_{{cookiecutter.module_name}} --parallel-mode
+commands =
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 commands = sphinx-build -W -b html doc/source doc/build/html