From ff6fd44f9c4d510acc95c5b33b151ab7efc3f535 Mon Sep 17 00:00:00 2001
From: Ronald Bradford <ronald.bradford@gmail.com>
Date: Thu, 1 Oct 2015 09:44:07 -0400
Subject: [PATCH] Fix coverage configuration and execution

A number of configuration errors prevent the successful creation of code
coverage. This corrects the .coveragerc source/omit setup and the tox
package name generation.

http://lists.openstack.org/pipermail/openstack-dev/2015-October/076193.html

Change-Id: Ie23fa6233a49e9db318b08d5a93e4dd7b0dae82d
---
 .coveragerc | 4 ++--
 .gitignore  | 5 +++--
 tox.ini     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 1f324622..a263f99f 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
 [run]
 branch = True
-source = log
-omit = log/tests/*,log/openstack/*
+source = oslo_log
+omit = oslo_log/tests/*
 
 [report]
 ignore_errors = True
diff --git a/.gitignore b/.gitignore
index 1399c981..d5526e01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.so
 
 # Packages
-*.egg
+*.egg*
 *.egg-info
 dist
 build
@@ -23,6 +23,7 @@ pip-log.txt
 
 # Unit test / coverage reports
 .coverage
+cover
 .tox
 nosetests.xml
 .testrepository
@@ -48,4 +49,4 @@ ChangeLog
 
 # Editors
 *~
-.*.swp
\ No newline at end of file
+.*.swp
diff --git a/tox.ini b/tox.ini
index 49ee6d1d..0a28c063 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ commands = {posargs}
 commands = python setup.py build_sphinx
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+commands = python setup.py test --coverage --coverage-package-name=oslo_log --testr-args='{posargs}'
 
 [flake8]
 # H803 skipped on purpose per list discussion.