From 9393cd451c74802c10ef37354077fe9702ec24f6 Mon Sep 17 00:00:00 2001
From: Ronald Bradford <ronald.bradford@gmail.com>
Date: Thu, 1 Oct 2015 19:54:59 +0000
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.

Change-Id: Ie55159304b8633acd6b06ba94d0cb8507a337504
---
 .coveragerc           | 5 +++--
 .gitignore            | 3 ++-
 test-requirements.txt | 2 ++
 tox.ini               | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 24a18ec9..9886691f 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,8 @@
 [run]
 branch = True
-source = versionedobjects
-omit = versionedobjects/tests/*,versionedobjects/openstack/*
+source = oslo_versionedobjects
+omit = oslo_versionedobjects/tests/*,versionedobjects/openstack/*
 
 [report]
 ignore_errors = True
+precision = 2
diff --git a/.gitignore b/.gitignore
index dfe851d0..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
diff --git a/test-requirements.txt b/test-requirements.txt
index c6077e92..012ef2f0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,3 +7,5 @@ testtools>=1.4.0
 # These are needed for docs generation
 oslosphinx>=2.5.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+
+coverage>=3.6
diff --git a/tox.ini b/tox.ini
index 7cdc7b6b..840d682b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,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_versionedobjects --testr-args='{posargs}'
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.