From aa4e9fabc10990f9efe152f78ae9bfb3c5a85fd5 Mon Sep 17 00:00:00 2001
From: zhurong <aaronzhu1121@gmail.com>
Date: Mon, 10 Sep 2018 10:42:13 +0800
Subject: [PATCH] Use standard cover tox env

Change-Id: I5710cd4d5a8ff95a17e5ef8dae4716fbb333dcf8
---
 .testr.conf    |  7 -----
 tools/cover.sh | 77 --------------------------------------------------
 tox.ini        |  9 +++++-
 3 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 .testr.conf
 delete mode 100755 tools/cover.sh

diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index a9ebfed68..000000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/tools/cover.sh b/tools/cover.sh
deleted file mode 100755
index f723813a5..000000000
--- a/tools/cover.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2015: Mirantis Inc.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-ALLOWED_EXTRA_MISSING=4
-
-show_diff () {
-    head -1 $1
-    diff -U 0 $1 $2 | sed 1,2d
-}
-
-# Stash uncommitted changes, checkout master and save coverage report
-uncommitted=$(git status --porcelain | grep -v "^??")
-[[ -n $uncommitted ]] && git stash > /dev/null
-git checkout HEAD^
-
-baseline_report=$(mktemp -t murano_coverageXXXXXXX)
-find . -type f -name "*.pyc" -delete && python setup.py testr --coverage --testr-args="$*"
-coverage report > $baseline_report
-baseline_missing=$(awk 'END { print $3 }' $baseline_report)
-
-# Checkout back and unstash uncommitted changes (if any)
-git checkout -
-[[ -n $uncommitted ]] && git stash pop > /dev/null
-
-# Generate and save coverage report
-current_report=$(mktemp -t murano_coverageXXXXXXX)
-find . -type f -name "*.pyc" -delete && python setup.py testr --coverage --testr-args="$*"
-coverage report > $current_report
-current_missing=$(awk 'END { print $3 }' $current_report)
-
-baseline_percentage=$(awk 'END { print $6 }' $baseline_report)
-current_percentage=$(awk 'END { print $6 }' $current_report)
-# Show coverage details
-allowed_missing=$((baseline_missing+ALLOWED_EXTRA_MISSING))
-
-echo "Baseline report: $(cat ${baseline_report})"
-echo "Proposed change report: $(cat ${current_report})"
-echo ""
-echo ""
-echo "Allowed to introduce missing lines : ${ALLOWED_EXTRA_MISSING}"
-echo "Missing lines in master            : ${baseline_missing}"
-echo "Missing lines in proposed change   : ${current_missing}"
-echo "Current percentage                 : ${baseline_percentage}"
-echo "Proposed change percentage         : ${current_percentage}"
-
-if [ $allowed_missing -gt $current_missing ];
-then
-    if [ $baseline_missing -lt $current_missing ];
-    then
-        show_diff $baseline_report $current_report
-        echo "I believe you can cover all your code with 100% coverage!"
-    else
-        echo "Thank you! You are awesome! Keep writing unit tests! :)"
-    fi
-    exit_code=0
-else
-    show_diff $baseline_report $current_report
-    echo "Please write more unit tests, we should keep our test coverage :( "
-    exit_code=1
-fi
-
-rm $baseline_report $current_report
-exit $exit_code
diff --git a/tox.ini b/tox.ini
index 341d8038c..dc1566adc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,7 +42,14 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
-commands = {toxinidir}/tools/cover.sh {posargs}
+setenv =
+    {[testenv]setenv}
+    PYTHON=coverage run --source murano --parallel-mode
+commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:debug]
 basepython = python3