From 47787402616e4df9e8be7b1899eff3264f50ed5e Mon Sep 17 00:00:00 2001
From: Valeriy Ponomaryov <vponomaryov@mirantis.com>
Date: Mon, 21 Sep 2015 15:06:59 +0300
Subject: [PATCH] Fix 'cover' tox job

Our 'cover' tox job does not work with release of 'coverage' package v4.0
It fails on option 'ignore-errors' in config section '[report]'.

So, replace usage of this option with CLI option '--ignore-errors'.

Change-Id: I404e3cb63453b0245ac05b4d3cb5780e5b8b7f9a
Closes-Bug: #1497897
---
 .coveragerc    | 1 -
 tools/cover.sh | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index b3bf10bad6..33e29c63aa 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -4,5 +4,4 @@ source = manila
 omit = manila/test*,manila/openstack/*
 
 [report]
-ignore-errors = True
 precision = 2
diff --git a/tools/cover.sh b/tools/cover.sh
index 10f900769c..69d46c625d 100755
--- a/tools/cover.sh
+++ b/tools/cover.sh
@@ -30,7 +30,7 @@ git checkout HEAD^
 
 baseline_report=$(mktemp -t manila_coverageXXXXXXX)
 find . -type f -name "*.pyc" -delete && python setup.py testr --coverage --testr-args="$TESTR_ARGS"
-coverage report > $baseline_report
+coverage report --ignore-errors > $baseline_report
 baseline_missing=$(awk 'END { print $3 }' $baseline_report)
 
 # Checkout back and unstash uncommited changes (if any)
@@ -40,7 +40,7 @@ git checkout -
 # Generate and save coverage report
 current_report=$(mktemp -t manila_coverageXXXXXXX)
 find . -type f -name "*.pyc" -delete && python setup.py testr --coverage --testr-args="$TESTR_ARGS"
-coverage report > $current_report
+coverage report --ignore-errors > $current_report
 current_missing=$(awk 'END { print $3 }' $current_report)
 
 # Show coverage details