From c7591381d624f3150d184645c984e3b4ae99bec6 Mon Sep 17 00:00:00 2001 From: vponomaryov Date: Fri, 28 Apr 2017 17:08:42 +0300 Subject: [PATCH] Fix 'cover' tox job 'cover' tox job fails on requirements version conflicts installing venv. But the problem is that it fails installing second venv, that is not used and is artifact of old approach for running tests. So, disable installation of old venv and use only tox venv, that works. Change-Id: Ic66281cd952906b92bc14873f48d1daa4ad6eb2e Closes-Bug: #1685325 --- tools/cover.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cover.sh b/tools/cover.sh index 74a05981..f9750cc9 100755 --- a/tools/cover.sh +++ b/tools/cover.sh @@ -31,7 +31,7 @@ uncommitted=$(git status --porcelain | grep -v "^??") git checkout HEAD^ baseline_report=$(mktemp -t manila_coverageXXXXXXX) -find . -type f -name "*.pyc" -delete && ./run_tests.sh -V --coverage --no-pep8 $TESTR_ARGS +find . -type f -name "*.pyc" -delete && ./run_tests.sh -N --coverage --no-pep8 $TESTR_ARGS coverage report > $baseline_report baseline_missing=$(awk 'END { print $3 }' $baseline_report) @@ -41,7 +41,7 @@ git checkout - # Generate and save coverage report current_report=$(mktemp -t manila_coverageXXXXXXX) -find . -type f -name "*.pyc" -delete && ./run_tests.sh -V --coverage --no-pep8 $TESTR_ARGS +find . -type f -name "*.pyc" -delete && ./run_tests.sh -N --coverage --no-pep8 $TESTR_ARGS coverage report > $current_report current_missing=$(awk 'END { print $3 }' $current_report)