From 70de210216fe662c9320f91eeca73483d3e2373c Mon Sep 17 00:00:00 2001 From: Carlos Natalino <carlos.natalino@chalmers.se> Date: Thu, 30 Sep 2021 15:07:19 +0000 Subject: [PATCH] Modifying the test and coverage execution files to accomodate the case where the project is located in any folder. --- .gitignore | 1 + report_coverage_all.sh | 4 +++- run_local_tests.sh | 11 +++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ab4ba81ba..63ee37a53 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ htmlcov/ .tox/ .nox/ .coverage +.coveragerc.final .coverage.* .cache nosetests.xml diff --git a/report_coverage_all.sh b/report_coverage_all.sh index e8e11c913..72c1be7dc 100755 --- a/report_coverage_all.sh +++ b/report_coverage_all.sh @@ -1,7 +1,9 @@ #!/bin/bash +PROJECTDIR=`pwd` + cd $(dirname $0)/src -RCFILE=~/teraflow/controller/coverage/.coveragerc +RCFILE=$PROJECTDIR/controller/coverage/.coveragerc echo echo "Coverage report:" diff --git a/run_local_tests.sh b/run_local_tests.sh index c817a792d..123ed9385 100755 --- a/run_local_tests.sh +++ b/run_local_tests.sh @@ -1,8 +1,13 @@ #!/bin/bash +PROJECTDIR=`pwd` + cd $(dirname $0)/src -RCFILE=~/teraflow/controller/coverage/.coveragerc -COVERAGEFILE=~/teraflow/controller/coverage/.coverage +RCFILE=$PROJECTDIR/coverage/.coveragerc.final +COVERAGEFILE=$PROJECTDIR/coverage/.coverage + +# configure the correct folder on the .coveragerc file +cat $PROJECTDIR/coverage/.coveragerc | sed s+~/teraflow/controller+$PROJECTDIR+g > $RCFILE # Run unitary tests and analyze coverage of code at same time @@ -33,3 +38,5 @@ export REDIS_DATABASE_ID='0' coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ common/database/tests/test_engine_redis.py \ tester_integration/test_context_device_service.py + +rm $RCFILE -- GitLab