From 7ba518eee672bce8be3886d1ae30694c8eeb7251 Mon Sep 17 00:00:00 2001
From: Erik Olof Gunnar Andersson <eandersson@blizzard.com>
Date: Sun, 2 Apr 2023 23:50:11 -0700
Subject: [PATCH] Replace cover job with simpler working job

Change-Id: I5f34f2e82c4157154f815ac3f537daf52823a933
---
 tools/cover.sh | 80 --------------------------------------------------
 tox.ini        |  9 +++++-
 2 files changed, 8 insertions(+), 81 deletions(-)
 delete mode 100755 tools/cover.sh

diff --git a/tools/cover.sh b/tools/cover.sh
deleted file mode 100755
index eaa78de96..000000000
--- a/tools/cover.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-#
-#    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.
-
-# This tool is borrowed from the Rally / Manila projects and revised to enhance
-# Senlin coverage test.
-
-ALLOWED_EXTRA_MISSING=4
-TESTR_ARGS="$*"
-
-show_diff () {
-    head -1 $1
-    diff -U 0 $1 $2 | sed 1,2d
-}
-
-if ! git diff --exit-code || ! git diff --cached --exit-code
-then
-    echo "There are uncommitted changes!"
-    echo "Please clean git working directory and try again"
-    exit 1
-fi
-
-# Checkout master and save coverage report
-git checkout HEAD^
-
-baseline_report=$(mktemp -t senlin_coverageXXXXXXX)
-find . -type f -name "*.py[c|o]" -delete && stestr run "$TESTR_ARGS" && coverage combine && coverage html -d cover
-coverage report --ignore-errors > $baseline_report
-cat $baseline_report
-if [ -d "cover-master" ]; then
-    rm -rf cover-master
-fi
-mv cover cover-master
-baseline_missing=$(awk 'END { print $3 }' $baseline_report)
-
-# Checkout back and save coverage report
-git checkout -
-
-# Generate and save coverage report
-current_report=$(mktemp -t senlin_coverageXXXXXXX)
-find . -type f -name "*.py[c|o]" -delete && stestr run "$TESTR_ARGS" && coverage combine && coverage html -d cover
-coverage report --ignore-errors > $current_report
-cat $current_report
-current_missing=$(awk 'END { print $3 }' $current_report)
-
-# Show coverage details
-allowed_missing=$((baseline_missing+ALLOWED_EXTRA_MISSING))
-
-echo "Allowed to introduce missing lines : ${ALLOWED_EXTRA_MISSING}"
-echo "Missing lines in master            : ${baseline_missing}"
-echo "Missing lines in proposed change   : ${current_missing}"
-
-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 4d6f234ca..036f1f737 100644
--- a/tox.ini
+++ b/tox.ini
@@ -64,7 +64,14 @@ commands = {posargs}
 setenv =
     {[testenv]setenv}
     PYTHON=coverage run --source senlin --parallel-mode
-commands = {toxinidir}/tools/cover.sh {posargs}
+commands =
+  coverage erase
+  find . -type f -name "*.pyc" -delete
+  stestr run --no-subunit-trace {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
+  coverage report --fail-under=90 --skip-covered
 
 [testenv:docs]
 deps =